diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2005-10-26 Tor Lillqvist <tml@novell.com> + + * configure.in: Don't require hal on Win32. + 2005-10-25 Harish Krishnaswamy <kharish@novell.com> * Makefile.am: Distclean should remove the header, diff --git a/configure.in b/configure.in index 7a67922107..ff88a1346c 100644 --- a/configure.in +++ b/configure.in @@ -103,6 +103,7 @@ case "$host" in SA_JUNK_PLUGIN='' DL_LIB='' SOFTOKN3_LIB='' + HAL_REQUIREMENT='' ;; *) os_win32=no NO_UNDEFINED='' @@ -110,6 +111,7 @@ case "$host" in SA_JUNK_PLUGIN=sa-junk-plugin DL_LIB='-ldl' SOFTOKN3_LIB='-lsoftokn3' + HAL_REQUIREMENT='hal' ;; esac AC_MSG_RESULT([$os_win32]) @@ -1276,7 +1278,7 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, $LIBSOUP >= $LIBSOUP_REQUIRED) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED hal) +EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $HAL_REQUIREMENT) AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) AC_SUBST(EVOLUTION_CALENDAR_LIBS) |