[monkey-bubble: 216/753] Depend on libbonoboui.

[Sven Herzberg <herzi src gnome org>]

commit fdc7b7dbb4d083f7c14aa6f58dbc0cdf9b9caec2
Author: Martin Baulig <baulig suse de>
Date:   Sun Apr 29 15:38:18 2001 +0000

    Depend on libbonoboui.
    
    2001-04-29  Martin Baulig  <baulig suse de>
    
    	* configure.in: Depend on libbonoboui.

 ChangeLog              |    4 ++++
 configure.in           |   10 +++++++---
 libgnomeui/Makefile.am |    6 +++++-
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 537d016..a2ce3ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-29  Martin Baulig  <baulig suse de>
+
+	* configure.in: Depend on libbonoboui.
+
 2001-04-21  Kjartan Maraas  <kmaraas gnome org>
 
 	* configure.in: Added nn and no to ALL_LINGUAS.
diff --git a/configure.in b/configure.in
index 06c2845..efcfcf2 100644
--- a/configure.in
+++ b/configure.in
@@ -51,6 +51,10 @@ AM_CONDITIONAL(FALSE, test x = y)
 dnl
 dnl Start of pkg-config checks
 dnl
+GNOME_PKGCONFIG_CHECK_MODULES(LIBGNOME, libgnome-2.0:1.96.0)
+AC_SUBST(LIBGNOME_CFLAGS)
+AC_SUBST(LIBGNOME_LIBS)
+
 GNOME_PKGCONFIG_CHECK_MODULES(LIBGNOMECANVAS, libgnomecanvas-2.0:1.96.0)
 AC_SUBST(LIBGNOMECANVAS_CFLAGS)
 AC_SUBST(LIBGNOMECANVAS_LIBS)
@@ -59,9 +63,9 @@ dnl AC_SUBST GTK+ version
 GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
 AC_SUBST(GTK_VERSION)
 
-dnl GNOME_PKGCONFIG_CHECK_MODULES(LIBBONOBO, libbonobo-2.0:1.96.0)
-dnl AC_SUBST(LIBBONOBO_CFLAGS)
-dnl AC_SUBST(LIBBONOBO_LIBS)
+GNOME_PKGCONFIG_CHECK_MODULES(LIBBONOBOUI, libbonoboui-2.0:1.96.0)
+AC_SUBST(LIBBONOBOUI_CFLAGS)
+AC_SUBST(LIBBONOBOUI_LIBS)
 
 AC_CHECK_LIB(popt, poptStrippedArgv,, AC_MSG_ERROR([popt 1.5 or newer is required to build
 gnome-libs. You can download the latest version from ftp://people.redhat.com/sopwith/popt/]))
diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
index f355b71..b6561e9 100644
--- a/libgnomeui/Makefile.am
+++ b/libgnomeui/Makefile.am
@@ -29,7 +29,9 @@ INCLUDES = \
         -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\" 	\
 	-DG_LOG_DOMAIN=\"GnomeUI\"			\
 	$(WARN_CFLAGS)					\
+	$(LIBGNOME_CFLAGS)				\
 	$(LIBGNOMECANVAS_CFLAGS)			\
+	$(LIBBONOBOUI_CFLAGS)				\
 	-DGTK_VERSION=\""$(GTK_VERSION)"\"		\
 	-DVERSION=\"$(VERSION)\"
 
@@ -249,7 +251,9 @@ libgnomeui_2_la_LDFLAGS = \
 	-version-info $(LIB_VERSION)
 
 libgnomeui_2_la_LIBADD = \
-	$(LIBGNOMECANVAS_LIBS)
+	$(LIBGNOME_LIBS)			\
+	$(LIBGNOMECANVAS_LIBS)			\
+	$(LIBBONOBOUI_LIBS)
 
 LDADD = \
 	libgnomeui-2.la