aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@ximian.com>2001-07-03 10:55:58 +0800
committerChris Lahey <clahey@src.gnome.org>2001-07-03 10:55:58 +0800
commitfd6ad06df5c3cf3928f9361d566aaaaffe498d2d (patch)
treeba91b681db9204b2d214f6658d5d1a0984eed839
parent793f0a6b869f1f934c0ea51ee762fed384180619 (diff)
downloadgsoc2013-evolution-fd6ad06df5c3cf3928f9361d566aaaaffe498d2d.tar
gsoc2013-evolution-fd6ad06df5c3cf3928f9361d566aaaaffe498d2d.tar.gz
gsoc2013-evolution-fd6ad06df5c3cf3928f9361d566aaaaffe498d2d.tar.bz2
gsoc2013-evolution-fd6ad06df5c3cf3928f9361d566aaaaffe498d2d.tar.lz
gsoc2013-evolution-fd6ad06df5c3cf3928f9361d566aaaaffe498d2d.tar.xz
gsoc2013-evolution-fd6ad06df5c3cf3928f9361d566aaaaffe498d2d.tar.zst
gsoc2013-evolution-fd6ad06df5c3cf3928f9361d566aaaaffe498d2d.zip
Made evolution depend on bonobo-conf 0.2.
2001-07-02 Christopher James Lahey <clahey@ximian.com> * configure.in: Made evolution depend on bonobo-conf 0.2. From calendar/ChangeLog: 2001-07-02 Christopher James Lahey <clahey@ximian.com> * gui/Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS). (evolution_calendar_LDADD): Added $(BONOBO_CONF_LIBS). From composer/ChangeLog: 2001-07-02 Christopher James Lahey <clahey@ximian.com> * Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS). From shell/ChangeLog: 2001-07-02 Christopher James Lahey <clahey@ximian.com> * Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS). (evolution_LDADD): Added $(BONOBO_CONF_LIBS). svn path=/trunk/; revision=10718
-rw-r--r--ChangeLog4
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/Makefile.am2
-rw-r--r--composer/ChangeLog4
-rw-r--r--composer/Makefile.am1
-rw-r--r--configure.in6
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/Makefile.am2
8 files changed, 29 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8171c36be0..543057c919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-02 Christopher James Lahey <clahey@ximian.com>
+
+ * configure.in: Made evolution depend on bonobo-conf 0.2.
+
2001-07-02 Larry Ewing <lewing@ximian.com>
* configure.in: Check for gtkhtml 0.9.99.1.
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 5a0043bf51..30dfeae151 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-02 Christopher James Lahey <clahey@ximian.com>
+
+ * gui/Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).
+ (evolution_calendar_LDADD): Added $(BONOBO_CONF_LIBS).
+
2001-07-02 Federico Mena Quintero <federico@ximian.com>
Support for ATTACH, DESCRIPTION properties in alarm components.
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index e3ec865d98..3922033791 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -48,6 +48,7 @@ INCLUDES = \
$(BONOBO_HTML_GNOME_CFLAGS) \
$(GNOME_VFS_CFLAGS) \
$(GAL_CFLAGS) \
+ $(BONOBO_CONF_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
@@ -143,6 +144,7 @@ evolution_calendar_LDADD = \
$(EXTRA_GNOME_LIBS) \
$(BONOBO_HTML_GNOME_LIBS) \
$(GNOME_VFS_LIBS) \
+ $(BONOBO_CONF_LIBS) \
$(GAL_LIBS) \
$(INTLLIBS)
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 4421e39866..fdf1fd4ce9 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-02 Christopher James Lahey <clahey@ximian.com>
+
+ * Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).
+
2001-07-02 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer-attachment-bar.c (attach_to_multipart): Set the
diff --git a/composer/Makefile.am b/composer/Makefile.am
index f51753a96e..aa38b9ea18 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -57,6 +57,7 @@ INCLUDES = \
$(GNOME_INCLUDEDIR) \
$(BONOBO_GNOME_CFLAGS) \
$(GTKHTML_CFLAGS) \
+ $(BONOBO_CONF_CFLAGS) \
-DEVOLUTION_DATADIR=\"$(datadir)\" \
-DE_GLADEDIR=\"$(gladedir)\" \
-DG_LOG_DOMAIN=\"composer\"
diff --git a/configure.in b/configure.in
index 07a0d0dd01..f5a1a66d29 100644
--- a/configure.in
+++ b/configure.in
@@ -496,6 +496,7 @@ dnl GNOME Libraries
dnl ***************
EVO_CHECK_LIB(Bonobo, bonobox, 1.0.3)
EVO_CHECK_LIB(OAF, oaf, 0.6.2)
+EVO_CHECK_LIB(Bonobo Conf, bonobo_conf, 0.2)
EVO_CHECK_LIB(libglade, libglade, 0.14)
EVO_CHECK_LIB(gdk-pixbuf with GNOME canvas support, gnomecanvaspixbuf, 0.9.0)
EVO_CHECK_LIB(GAL, gal, 0.8.99.7)
@@ -519,6 +520,11 @@ GAL_LIBS="`gnome-config --libs gal`"
AC_SUBST(GAL_CFLAGS)
AC_SUBST(GAL_LIBS)
+BONOBO_CONF_CFLAGS="`gnome-config --cflags bonobo_conf`"
+BONOBO_CONF_LIBS="`gnome-config --libs bonobo_conf`"
+AC_SUBST(BONOBO_CONF_CFLAGS)
+AC_SUBST(BONOBO_CONF_LIBS)
+
EXTRA_GNOME_LIBS="`gnome-config --libs libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal` $THREADS_LIBS"
EXTRA_GNOME_CFLAGS="`gnome-config --cflags libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal` $THREADS_CFLAGS"
diff --git a/shell/ChangeLog b/shell/ChangeLog
index aa2e14080f..a1aca471b4 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-02 Christopher James Lahey <clahey@ximian.com>
+
+ * Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).
+ (evolution_LDADD): Added $(BONOBO_CONF_LIBS).
+
2001-07-02 Ettore Perazzoli <ettore@ximian.com>
* e-storage-set-view.c (popup_folder_menu): Don't assert that
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 99effbd86c..fc2d32e3e1 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = -O \
-I$(top_srcdir) \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \
+ $(BONOBO_CONF_CFLAGS) \
-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
@@ -165,6 +166,7 @@ evolution_LDADD = \
$(EXTRA_GNOME_LIBS) \
$(GNOME_PRINT_LIBS) \
$(GTKHTML_LIBS) \
+ $(BONOBO_CONF_LIBS) \
$(BONOBO_GNOME_LIBS)
# Test component