aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/gui/Makefile.am2
-rw-r--r--configure.in5
4 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b747bfd25..4dd14eddf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-13 Rodney Dawes <dobey@ximian.com>
+
+ * configure.in: Check for libsoup separately
+
2004-01-12 JP Rosevear <jpr@ximian.com>
* configure.in: bump version and requirements
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 7e339fddfc..4b53d5aefd 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-13 Rodney Dawes <dobey@ximian.com>
+
+ * gui/Makefile.am: Only link in libsoup where we need it
+
2004-01-13 Rodrigo Moya <rodrigo@ximian.com>
* gui/calendar-component.c (impl_upgradeFromVersion): free 'base_uri'
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index fe5916c50b..ac3b8c353c 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -74,6 +74,7 @@ INCLUDES = \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
-DPREFIX=\""$(prefix)"\" \
+ $(LIBSOUP_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS)
glade_DATA = \
@@ -221,6 +222,7 @@ libevolution_calendar_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la \
+ $(LIBSOUP_LIBS) \
$(EVOLUTION_CALENDAR_LIBS)
libevolution_calendar_la_LDFLAGS = -avoid-version -module
diff --git a/configure.in b/configure.in
index 3645d2c913..aef88ba0ee 100644
--- a/configure.in
+++ b/configure.in
@@ -1074,8 +1074,11 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
fi
dnl --- evolution-calendar flags
+EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.2 >= 2.1.3)
+AC_SUBST(LIBSOUP_CFLAGS)
+AC_SUBST(LIBSOUP_LIBS)
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.2 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED libsoup-2.2 >= 2.1.3 libebook-1.0 >= $EDS_REQUIRED libecal-1.0 >= $EDS_REQUIRED)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.2 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED libebook-1.0 >= $EDS_REQUIRED libecal-1.0 >= $EDS_REQUIRED)
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_LIBS)