aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-03-30 01:28:42 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-03-30 01:28:42 +0800
commit02c6da774e30c0a3c3936851e149edd7bb7ee401 (patch)
tree432745d573f3e876c34a75951f18438ff67e539a
parent2ae8bdc41a685dd57200b3d9cb1502abc1f6e203 (diff)
downloadgsoc2013-evolution-02c6da774e30c0a3c3936851e149edd7bb7ee401.tar.gz
gsoc2013-evolution-02c6da774e30c0a3c3936851e149edd7bb7ee401.tar.zst
gsoc2013-evolution-02c6da774e30c0a3c3936851e149edd7bb7ee401.zip
Check for GConf. Add gthreads to LIBIBEX_CFLAGS and LIBIBEX_LIBS.
* configure.in: Check for GConf. Add gthreads to LIBIBEX_CFLAGS and LIBIBEX_LIBS. svn path=/trunk/; revision=16281
-rw-r--r--ChangeLog9
-rw-r--r--configure.in7
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c6d31fe94..c5db9dd25e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
-2002-03-28 Christopher James Lahey <clahey@ximian.com>
+2002-03-29 Ettore Perazzoli <ettore@ximian.com>
- * configure.in: Bumped the required version of gal to 0.19.99.10.
+ * configure.in: Check for GConf. Add gthreads to LIBIBEX_CFLAGS
+ and LIBIBEX_LIBS.
-2002-03-27 Ettore Perazzoli <ettore@ximian.com>
+2002-03-28 Christopher James Lahey <clahey@ximian.com>
- * configure.in: Add gthreads to LIBIBEX_CFLAGS and LIBIBEX_LIBS.
+ * configure.in: Bumped the required version of gal to 0.19.99.10.
2002-03-24 Peter Williams <peterw@ximian.com>
diff --git a/configure.in b/configure.in
index 49bca50fb7..0bd89407b2 100644
--- a/configure.in
+++ b/configure.in
@@ -583,6 +583,11 @@ EVO_CHECK_LIB(GAL, gal, 0.19.99.10)
EVO_CHECK_LIB(GtkHTML, gtkhtml, 1.0)
EVO_CHECK_LIB(Libsoup, soup, 0.6)
+AM_PATH_GCONF(1.0)
+if test "x$GCONF_CFLAGS" = "x" ; then
+ AC_MSG_ERROR(Evolution requires GConf to be installed)
+fi
+
dnl ******************************
dnl Pilot checking
dnl ******************************
@@ -1045,7 +1050,7 @@ dnl --- evolution-mail flags
camel_providerdir='$(libdir)/evolution/camel-providers/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION
AC_SUBST(camel_providerdir)
-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, $FULL_GNOME_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, $FULL_GNOME_DEPS, $GCONF_CFLAGS $THREADS_CFLAGS, $GCONF_LIBS $THREADS_LIBS)
AC_SUBST(EVOLUTION_MAIL_CFLAGS)
AC_SUBST(EVOLUTION_MAIL_LIBS)