callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made evolution depend on bonobo-conf 0.2.

Browse Source 
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
This commit is contained in:
Christopher James Lahey
2001-07-03 02:55:58 +00:00
committed by Chris Lahey
parent 793f0a6b86
commit fd6ad06df5
8 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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.

5
calendar/ChangeLog
View File

@ -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.

2
calendar/gui/Makefile.am
View File

@ -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)

4
composer/ChangeLog
View File

@ -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

1
composer/Makefile.am
View File

@ -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\"

6
configure.in
View File

@ -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"

5
shell/ChangeLog
View File

@ -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

2
shell/Makefile.am
View File

@ -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