aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-10-14 02:34:30 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-10-14 02:34:30 +0800
commitf3f0f9d12cd119b9beaf9c2be9cdb3f84dafe6ec (patch)
tree5db531fd5648a947413e19ba40f1577ec1cbde54
parent593cf4d9e9247d5d694a71371b42724bd82fe1be (diff)
downloadgsoc2013-evolution-f3f0f9d12cd119b9beaf9c2be9cdb3f84dafe6ec.tar.gz
gsoc2013-evolution-f3f0f9d12cd119b9beaf9c2be9cdb3f84dafe6ec.tar.zst
gsoc2013-evolution-f3f0f9d12cd119b9beaf9c2be9cdb3f84dafe6ec.zip
pull in libedataserverui as appropriate
2004-10-13 JP Rosevear <jpr@novell.com> * configure.in: pull in libedataserverui as appropriate svn path=/trunk/; revision=27567
-rw-r--r--ChangeLog4
-rw-r--r--configure.in11
2 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a8803bd03..c5c2446311 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-13 JP Rosevear <jpr@novell.com>
+
+ * configure.in: pull in libedataserverui as appropriate
+
2004-10-01 Jeffrey Stedfast <fejj@novell.com>
* configure.in (localedir): Enable imap4 plugin by default. We
diff --git a/configure.in b/configure.in
index deb80a2d22..30a0798a06 100644
--- a/configure.in
+++ b/configure.in
@@ -1169,11 +1169,6 @@ EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE >= $EDS_REQUIRED, $GNOME_FU
AC_SUBST(TZDIALOG_CFLAGS)
AC_SUBST(TZDIALOG_LIBS)
-EVO_SET_COMPILE_FLAGS(SOURCE_SEL, libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED, $GNOME_FULL_CFLAGS, $GNOME_FULL_LIBS)
-AC_SUBST(SOURCE_SEL_CFLAGS)
-AC_SUBST(SOURCE_SEL_LIBS)
-
-
dnl
dnl EVO_SET_COMPILE_FLAGS(E_WIDGETS, bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs)
dnl AC_SUBST(E_WIDGETS_CFLAGS)
@@ -1195,7 +1190,7 @@ AC_SUBST(SHELL_LIBS)
dnl --- evolution-addressbook flags
-EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED"
+EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED"
EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -1212,7 +1207,7 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.2 >= 2.2.0)
AC_SUBST(LIBSOUP_CFLAGS)
AC_SUBST(LIBSOUP_LIBS)
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED)
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_LIBS)
@@ -1420,6 +1415,7 @@ dnl ******************************
export privlibdir
export privincludedir
export privdatadir
+export plugindir
EVOLUTION_DIR=`(cd $srcdir; pwd)`
AC_SUBST(EVOLUTION_DIR)
@@ -1510,6 +1506,7 @@ mail/Makefile
mail/default/Makefile
mail/default/C/Makefile
mail/importers/Makefile
+plugins/Makefile
smime/Makefile
smime/lib/Makefile
smime/gui/Makefile