aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2003-01-27 10:53:32 +0800
committerChris Toshok <toshok@src.gnome.org>2003-01-27 10:53:32 +0800
commit734a5f154e5b1cf1fc65d66a2a66a8916d8a05fd (patch)
treef1427f7abbe2fd88b7767fb6e39e71822f04ac5f
parent2a000947a59200e1bd0ce9ab56f1a3aa5b3890bb (diff)
downloadgsoc2013-evolution-734a5f154e5b1cf1fc65d66a2a66a8916d8a05fd.tar
gsoc2013-evolution-734a5f154e5b1cf1fc65d66a2a66a8916d8a05fd.tar.gz
gsoc2013-evolution-734a5f154e5b1cf1fc65d66a2a66a8916d8a05fd.tar.bz2
gsoc2013-evolution-734a5f154e5b1cf1fc65d66a2a66a8916d8a05fd.tar.lz
gsoc2013-evolution-734a5f154e5b1cf1fc65d66a2a66a8916d8a05fd.tar.xz
gsoc2013-evolution-734a5f154e5b1cf1fc65d66a2a66a8916d8a05fd.tar.zst
gsoc2013-evolution-734a5f154e5b1cf1fc65d66a2a66a8916d8a05fd.zip
only do the CONDUIT_CFLAGS/LIBS stuff if pilot conduits have been enabled.
2003-01-26 Chris Toshok <toshok@ximian.com> * configure.in: only do the CONDUIT_CFLAGS/LIBS stuff if pilot conduits have been enabled. svn path=/trunk/; revision=19638
-rw-r--r--ChangeLog5
-rw-r--r--configure.in6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 98b590f967..ec6fed5243 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2003-01-26 Chris Toshok <toshok@ximian.com>
+ * configure.in: only do the CONDUIT_CFLAGS/LIBS stuff if pilot
+ conduits have been enabled.
+
+2003-01-26 Chris Toshok <toshok@ximian.com>
+
* configure.in: in the --enable-pilot-conduits stanza, use
PKG_CHECK_MODULES to get the gnome-pilot-2.0 (and therefore
pilot-link) cflags/libs before doing our utf-8 check. also,
diff --git a/configure.in b/configure.in
index 18fd097f69..1b65c9fa16 100644
--- a/configure.in
+++ b/configure.in
@@ -1110,9 +1110,11 @@ EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
+if test x$enable_pilot_conduits = xyes; then
EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK_CONDUIT, gnome-pilot-2.0 $EVOLUTION_ADDRESSBOOK_DEPS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
+fi
dnl -- evolution-executive-summary flags
@@ -1126,13 +1128,15 @@ EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonobou
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_LIBS)
+if test x$enable_pilot_conduits = xyes; then
EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR_CONDUIT, gnome-pilot-2.0 $EVOLUTION_CALENDAR_DEPS)
AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+fi
dnl --- evolution-mail flags
-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libglade-2.0 soup-2.0 libgnomeprint-2.2 libgtkhtml-3.0 libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libglade-2.0 soup-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.0 libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss)
AC_SUBST(EVOLUTION_MAIL_CFLAGS)
AC_SUBST(EVOLUTION_MAIL_LIBS)