aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-16 06:03:09 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-16 06:03:09 +0800
commit55cb4cb2729ee7a2875c91ddf5ae1054d1202562 (patch)
tree3cc993d22dc53c02736d0f2ede7084df7506f296
parent283ba95b54a306774a2883141ef3cdfb39cd0e96 (diff)
downloadgsoc2013-evolution-55cb4cb2729ee7a2875c91ddf5ae1054d1202562.tar.gz
gsoc2013-evolution-55cb4cb2729ee7a2875c91ddf5ae1054d1202562.tar.zst
gsoc2013-evolution-55cb4cb2729ee7a2875c91ddf5ae1054d1202562.zip
Set up the my-evolution flags properly, do not
AC_SUBST GNOME_Evolution_Mail.server.in. svn path=/trunk/; revision=18789
-rw-r--r--ChangeLog5
-rw-r--r--configure.in11
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index ac94033754..f1776fea9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-15 Ettore Perazzoli <ettore@ximian.com>
+
+ * configure.in: Set up the my-evolution flags properly, do not
+ AC_SUBST GNOME_Evolution_Mail.server.in.
+
2002-11-13 Not Zed <NotZed@Ximian.com>
* Makefile.am (SUBDIRS): re-added filter, mail, composer
diff --git a/configure.in b/configure.in
index 48d541ceb4..0599ed9ca1 100644
--- a/configure.in
+++ b/configure.in
@@ -1079,7 +1079,7 @@ AC_SUBST(LIBFILTER_LIBS)
dnl --- evolution (shell) flags
-EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 libglade-2.0 gnome-vfs-2.0, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS})
+EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 libglade-2.0 gnome-vfs-2.0 libgtkhtml-3.0)
AC_SUBST(SHELL_CFLAGS)
AC_SUBST(SHELL_LIBS)
@@ -1097,10 +1097,9 @@ dnl AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
dnl -- evolution-executive-summary flags
-dnl EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY,
-dnl bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf soup vfs, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS})
-dnl AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
-dnl AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY, libbonoboui-2.0 libbonoboui-2.0 gal-2.0 libgnomeui-2.0 libglade-2.0 libgnomeprint-2.0 libgnomeprintui-2.0 soup-2.0 libgtkhtml-3.0)
+AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
+AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
dnl --- evolution-calendar flags
@@ -1320,8 +1319,6 @@ calendar/gui/dialogs/Makefile
calendar/importers/Makefile
composer/Makefile
mail/Makefile
-mail/GNOME_Evolution_Mail.server.in
-my-evolution/GNOME_Evolution_Summary.server.in
])
if test "x$with_sub_version" != "x"; then