aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.in18
2 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index a147a82891..98b590f967 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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,
+ enable the addressbook/calendar CONDUIT_{CFLAGS/LIBS} variables.
+
2003-01-24 Ettore Perazzoli <ettore@ximian.com>
* configure.in (evolutionuidir): Define iconsdir.
diff --git a/configure.in b/configure.in
index c625d9e207..18fd097f69 100644
--- a/configure.in
+++ b/configure.in
@@ -564,12 +564,12 @@ dnl ******************************
AC_ARG_ENABLE(pilot-conduits,
[ --enable-pilot-conduits=[no/yes] Enable support for building pilot conduits.],,enable_pilot_conduits=no)
if test "x$enable_pilot_conduits" = "xyes"; then
- GNOME_PILOT_CHECK
+ PKG_CHECK_MODULES(GNOME_PILOT, gnome-pilot-2.0)
CFLAGS_save="$CFLAGS"
- CFLAGS="$CFLAGS $PISOCK_CFLAGS"
+ CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS"
LDFLAGS_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $PISOCK_LIBS"
+ LDFLAGS="$LDFLAGS $GNOME_PILOT_LIBS"
AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions], ac_cv_pilot_link_utf8, AC_TRY_RUN([
@@ -1110,9 +1110,9 @@ EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
-dnl EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK_CONDUIT, gpilot $EVOLUTION_ADDRESSBOOK_DEPS, $PISOCK_CFLAGS)
-dnl AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
-dnl AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
+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)
dnl -- evolution-executive-summary flags
@@ -1126,9 +1126,9 @@ EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonobou
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_LIBS)
-dnl EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR_CONDUIT, gpilot $EVOLUTION_CALENDAR_DEPS, $PISOCK_CFLAGS)
-dnl AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-dnl AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+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)
dnl --- evolution-mail flags