projects / platform / upstream / evolution-data-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0f32bae)
Add LIBBONOBO_REQUIRED, and AC_SUBST() it
authorRodney Dawes <dobey@ximian.com>
Mon, 15 Mar 2004 17:33:25 +0000 (17:33 +0000)
committerRodney Dawes <dobey@src.gnome.org>
Mon, 15 Mar 2004 17:33:25 +0000 (17:33 +0000)
2004-03-15  Rodney Dawes  <dobey@ximian.com>

* configure.in: Add LIBBONOBO_REQUIRED, and AC_SUBST() it
* evolution-data-server-1.0.pc.in:
* libedataserver/libedataserver-1.0.pc.in: Add @LIBBONOBO_REQUIRED@ for
the libbonobo dependency

2004-03-15  Rodney Dawes  <dobey@ximian.com>

* libebook/libebook-1.0.pc.in:
* libedata-book/libedata-book-1.0.pc.in: Add @LIBBONOBO_REQUIRED@ for
the libbonobo dependency

2004-03-15  Rodney Dawes  <dobey@ximian.com>

* libecal/libecal-1.0.pc.in:
* libedata-cal/libedata-cal-1.0.pc.in: Add @LIBBONOBO_REQUIRED@ for
the libbonobo dependency

ChangeLog patch | blob | history
addressbook/ChangeLog patch | blob | history
addressbook/libebook/libebook-1.0.pc.in patch | blob | history
addressbook/libedata-book/libedata-book-1.0.pc.in patch | blob | history
calendar/ChangeLog patch | blob | history
calendar/libecal/libecal-1.0.pc.in patch | blob | history
calendar/libedata-cal/libedata-cal-1.0.pc.in patch | blob | history
configure.in patch | blob | history
evolution-data-server-1.0.pc.in patch | blob | history
libedataserver/libedataserver-1.0.pc.in patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index d4a15d8..83e01a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-15  Rodney Dawes  <dobey@ximian.com>
+
+       * configure.in: Add LIBBONOBO_REQUIRED, and AC_SUBST() it
+       * evolution-data-server-1.0.pc.in:
+       * libedataserver/libedataserver-1.0.pc.in: Add @LIBBONOBO_REQUIRED@ for
+       the libbonobo dependency
+
 2004-03-05  JP Rosevear <jpr@ximian.com>
 
        * configure.in: bump version, libtool numbers and soup requirement
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index dada429..e0e9085 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-15  Rodney Dawes  <dobey@ximian.com>
+
+       * libebook/libebook-1.0.pc.in:
+       * libedata-book/libedata-book-1.0.pc.in: Add @LIBBONOBO_REQUIRED@ for
+       the libbonobo dependency
+
 2004-03-14  Harish K <kharish@novell.com>
        *  backends/groupwise/e-book-backend-groupwise.c :
        Update calls to e_gw_connection_get_items with the new prototype.
diff --git a/addressbook/libebook/libebook-1.0.pc.in b/addressbook/libebook/libebook-1.0.pc.in
index 143b054..a23003e 100644 (file)
--- a/addressbook/libebook/libebook-1.0.pc.in
+++ b/addressbook/libebook/libebook-1.0.pc.in
@@ -11,6 +11,6 @@ privincludedir=@privincludedir@
 Name: libebook
 Description: Client library for evolution address books
 Version: @VERSION@
-Requires: libbonobo-2.0 libgnome-2.0 libedataserver-1.0
+Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.0
 Libs: -L${libdir} -lebook
 Cflags: -I${privincludedir}
diff --git a/addressbook/libedata-book/libedata-book-1.0.pc.in b/addressbook/libedata-book/libedata-book-1.0.pc.in
index fa5f32b..4a8e133 100644 (file)
--- a/addressbook/libedata-book/libedata-book-1.0.pc.in
+++ b/addressbook/libedata-book/libedata-book-1.0.pc.in
@@ -11,6 +11,6 @@ privincludedir=@privincludedir@
 Name: libedatabook
 Description: Backend library for evolution address books
 Version: @VERSION@
-Requires: libbonobo-2.0 libgnome-2.0 libedataserver-1.0 libebook-1.0
+Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.0 libebook-1.0
 Libs: -L${libdir} -ledata-book
 Cflags: -I${privincludedir}
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 0bab5e6..53d5154 100644 (file)
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-15  Rodney Dawes  <dobey@ximian.com>
+
+       * libecal/libecal-1.0.pc.in:
+       * libedata-cal/libedata-cal-1.0.pc.in: Add @LIBBONOBO_REQUIRED@ for
+       the libbonobo dependency
+
 2004-03-14  Harish K <kharish@novell.com>
        * calendar/backends/groupwise/e-cal-backend-groupwise.c :
        Update calls to e_gw_connection_get_items with the new prototype.
diff --git a/calendar/libecal/libecal-1.0.pc.in b/calendar/libecal/libecal-1.0.pc.in
index 6056230..8f57f6c 100644 (file)
--- a/calendar/libecal/libecal-1.0.pc.in
+++ b/calendar/libecal/libecal-1.0.pc.in
@@ -11,6 +11,6 @@ privincludedir=@privincludedir@
 Name: libedatacal
 Description: Backend library for evolution calendars
 Version: @VERSION@
-Requires: libgnome-2.0 libbonobo-2.0 libedataserver-1.0
+Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libedataserver-1.0
 Libs: -L${libdir} -lecal
 Cflags: -I${privincludedir}
diff --git a/calendar/libedata-cal/libedata-cal-1.0.pc.in b/calendar/libedata-cal/libedata-cal-1.0.pc.in
index 9dc6e67..722b2da 100644 (file)
--- a/calendar/libedata-cal/libedata-cal-1.0.pc.in
+++ b/calendar/libedata-cal/libedata-cal-1.0.pc.in
@@ -11,6 +11,6 @@ privincludedir=@privincludedir@
 Name: libecal
 Description: Client library for evolution calendars
 Version: @VERSION@
-Requires: libgnome-2.0 libbonobo-2.0 gnome-vfs-2.0 libedataserver-1.0 libecal-1.0
+Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ gnome-vfs-2.0 libedataserver-1.0 libecal-1.0
 Libs: -L${libdir} -ledata-cal -lecal
 Cflags: -I${privincludedir}
diff --git a/configure.in b/configure.in
index a5a2a23..28bad53 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -122,6 +122,10 @@ no)
        esac
 esac
 
+LIBBONOBO_REQUIRED="2.4.0"
+
+AC_SUBST(LIBBONOBO_REQUIRED)
+
 dnl *******************
 dnl GObject marshalling
 dnl *******************
@@ -176,13 +180,13 @@ EVO_SET_COMPILE_FLAGS(E_NAME, glib-2.0)
 AC_SUBST(E_NAME_CFLAGS)
 AC_SUBST(E_NAME_LIBS)
 
-EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, libxml-2.0 libbonobo-2.0 libgnome-2.0, $THREADS_CFLAGS, $THREADS_LIBS)
+EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, libxml-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0, $THREADS_CFLAGS, $THREADS_LIBS)
 AC_SUBST(E_DATA_SERVER_CFLAGS)
 AC_SUBST(E_DATA_SERVER_LIBS)
 
 dnl --- evolution-addressbook flags
 
-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gconf-2.0 libbonobo-2.0 libgnome-2.0 gnome-vfs-2.0"
+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gconf-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0"
 
 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -190,7 +194,7 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
 
 dnl --- evolution-calendar flags
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libxml-2.0 libgnome-2.0 libbonobo-2.0 gnome-vfs-2.0)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libxml-2.0 libgnome-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED gnome-vfs-2.0)
 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 
diff --git a/evolution-data-server-1.0.pc.in b/evolution-data-server-1.0.pc.in
index a76c891..ca6ac02 100644 (file)
--- a/evolution-data-server-1.0.pc.in
+++ b/evolution-data-server-1.0.pc.in
@@ -9,4 +9,4 @@ IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 Name: evolution-data-server
 Description: The evolution data server for the calendar and addressbook
 Version: @VERSION@
-Requires: libgnome-2.0 libbonobo-2.0
\ No newline at end of file
+Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@
diff --git a/libedataserver/libedataserver-1.0.pc.in b/libedataserver/libedataserver-1.0.pc.in
index bb95c34..15fd63d 100644 (file)
--- a/libedataserver/libedataserver-1.0.pc.in
+++ b/libedataserver/libedataserver-1.0.pc.in
@@ -11,6 +11,6 @@ privincludedir=@privincludedir@
 Name: libedataserver
 Description: Utily library for evolution data servers
 Version: @VERSION@
-Requires: libbonobo-2.0 libgnome-2.0 libxml-2.0
+Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libxml-2.0
 Libs: -L${libdir} -ledataserver
 Cflags: -I${privincludedir}
Domain: Service Framework / Uncategorized;