aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-10-26 18:49:58 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-10-26 18:49:58 +0800
commite2e1702e9a3af76bed744aab835b71414eb144ca (patch)
tree8dba78168ff52f1d337f0ecda032d2675ae6bbaa /configure.in
parenteec09a3e6b0f364fbe1db4c0915dad8df4acb875 (diff)
downloadgsoc2013-evolution-e2e1702e9a3af76bed744aab835b71414eb144ca.tar
gsoc2013-evolution-e2e1702e9a3af76bed744aab835b71414eb144ca.tar.gz
gsoc2013-evolution-e2e1702e9a3af76bed744aab835b71414eb144ca.tar.bz2
gsoc2013-evolution-e2e1702e9a3af76bed744aab835b71414eb144ca.tar.lz
gsoc2013-evolution-e2e1702e9a3af76bed744aab835b71414eb144ca.tar.xz
gsoc2013-evolution-e2e1702e9a3af76bed744aab835b71414eb144ca.tar.zst
gsoc2013-evolution-e2e1702e9a3af76bed744aab835b71414eb144ca.zip
Don't require hal on Win32.
2005-10-26 Tor Lillqvist <tml@novell.com> * configure.in: Don't require hal on Win32. svn path=/trunk/; revision=30568
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in4
1 files changed, 3 insertions, 1 deletions
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)