aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in29
1 files changed, 18 insertions, 11 deletions
diff --git a/configure.in b/configure.in
index 8f3bf12ec1..ed543a3b83 100644
--- a/configure.in
+++ b/configure.in
@@ -77,6 +77,10 @@ if gnome-config --libs print > /dev/null 2>&1; then
else
AC_MSG_ERROR(Did not find GnomePrint installed)
fi
+GNOME_PRINT_LIBS=`gnome-config --libs print`
+GNOME_PRINT_CFLAGS=`gnome-config --cflags print`
+AC_SUBST(GNOME_PRINT_LIBS)
+AC_SUBST(GNOME_PRINT_CFLAGS)
dnl **************************************************
dnl * ORBit support
@@ -174,17 +178,6 @@ AC_SUBST(BONOBO_HTML_GNOME_LIBS)
AC_SUBST(BONOBO_HTML_GNOME_CFLAGS)
-
-BONOBO_VFS_GNOME_LIBS="`gnome-config --libs gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs `"
-BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs `"
-AC_SUBST(BONOBO_VFS_GNOME_LIBS)
-AC_SUBST(BONOBO_VFS_GNOME_CFLAGS)
-
-dnl ******************************
-dnl Pilot checking
-dnl ******************************
-GNOME_PILOT_CHECK
-
dnl ******************************
dnl Gnome-VFS checking
dnl ******************************
@@ -201,10 +194,23 @@ else
AC_MSG_ERROR(GNOME-VFS is required to compile Evolution)
fi
+BONOBO_VFS_GNOME_LIBS="`gnome-config --libs gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs `"
+BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs `"
+AC_SUBST(BONOBO_VFS_GNOME_LIBS)
+AC_SUBST(BONOBO_VFS_GNOME_CFLAGS)
+
+dnl ******************************
+dnl Pilot checking
+dnl ******************************
+GNOME_PILOT_CHECK
+
+
AC_ARG_WITH(camel-hard-log-level, [ --with-camel-hard-log-level=level value of log level in camel (0-10)],
camel_hard_log_level="$withval", camel_hard_log_level="0")
AC_DEFINE_UNQUOTED(CAMEL_HARD_LOG_LEVEL, $camel_hard_log_level)
+AC_CONFIG_SUBDIRS(libical)
+
AC_SUBST(CAPPLET_LIBS)
AC_OUTPUT([
@@ -238,6 +244,7 @@ shell/Makefile
mail/Makefile
data/Makefile
libversit/Makefile
+libibex/Makefile
calendar/Makefile
calendar/doc/Makefile
calendar/doc/C/Makefile