[monkey-bubble: 458/753] Use PKG_CHECK_MODULES from pkg-config to check for stuff.

[Sven Herzberg <herzi src gnome org>]

commit fbadf5563368ff9ae769470501fef03930cf1e85
Author: Martin Baulig <baulig suse de>
Date:   Wed Jun 13 19:26:32 2001 +0000

    Use PKG_CHECK_MODULES from pkg-config to check for stuff.
    
    2001-06-13  Martin Baulig  <baulig suse de>
    
    	* configure.in: Use PKG_CHECK_MODULES from pkg-config to
    	check for stuff.

 ChangeLog              |    5 +++++
 components/Makefile.am |    8 ++++----
 configure.in           |   20 ++++++++++----------
 demos/Makefile.am      |    5 ++---
 libgnomeui/Makefile.am |    8 ++------
 5 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1d97354..661a81b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-06-13  Martin Baulig  <baulig suse de>
 
+	* configure.in: Use PKG_CHECK_MODULES from pkg-config to
+	check for stuff.
+
+2001-06-13  Martin Baulig  <baulig suse de>
+
 	* gnome.h: Moved to libcompat.
 
 	The plan with #include <gnome.h> is the same than with
diff --git a/components/Makefile.am b/components/Makefile.am
index e40b966..6d55e4e 100644
--- a/components/Makefile.am
+++ b/components/Makefile.am
@@ -22,9 +22,7 @@ INCLUDES = \
 	-DGNOMEUIXMLDBFILE=\""$(componentdir)/selector-components.xmldb"\" \
 	-DG_LOG_DOMAIN=\"GnomeUI-Components\"		\
 	$(WARN_CFLAGS)					\
-	$(LIBGNOME_CFLAGS)				\
-	$(LIBGNOMECANVAS_CFLAGS)			\
-	$(LIBBONOBOUI_CFLAGS)				\
+	$(LIBGNOMEUI_COMPONENTS_CFLAGS)			\
 	-DGTK_VERSION=\""$(GTK_VERSION)"\"		\
 	-DVERSION=\"$(VERSION)\"
 
@@ -48,4 +46,6 @@ libgnomeui_components_2_la_LDFLAGS = \
 	-version-info $(LIB_VERSION)
 
 libgnomeui_components_2_la_LIBADD = \
-	../libgnomeui/libgnomeui-2.la
+	../libgnomeui/libgnomeui-2.la		\
+	$(LIBGNOMEUI_COMPONENTS_LIBS)
+
diff --git a/configure.in b/configure.in
index 447c2c9..819ef2e 100644
--- a/configure.in
+++ b/configure.in
@@ -49,22 +49,22 @@ 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)
+PKG_CHECK_MODULES(LIBGNOMEUI, libgnome-2.0 >= 1.96.0 libgnomecanvas-2.0 >= 1.96.0 libbonoboui-2.0 >= 1.96.0)
+AC_SUBST(LIBGNOMEUI_CFLAGS)
+AC_SUBST(LIBGNOMEUI_LIBS)
 
-GNOME_PKGCONFIG_CHECK_MODULES(LIBGNOMECANVAS, libgnomecanvas-2.0:1.96.0)
-AC_SUBST(LIBGNOMECANVAS_CFLAGS)
-AC_SUBST(LIBGNOMECANVAS_LIBS)
+PKG_CHECK_MODULES(LIBGNOMEUI_COMPONENTS, libgnome-2.0 >= 1.96.0 libgnomecanvas-2.0 >= 1.96.0 libbonoboui-2.0 >= 1.96.0)
+AC_SUBST(LIBGNOMEUI_COMPONENTS_CFLAGS)
+AC_SUBST(LIBGNOMEUI_COMPONENTS_LIBS)
+
+PKG_CHECK_MODULES(LIBGNOMEUI_DEMOS, libgnome-2.0 >= 1.96.0 libgnomecanvas-2.0 >= 1.96.0 libbonoboui-2.0 >= 1.96.0)
+AC_SUBST(LIBGNOMEUI_DEMOS_CFLAGS)
+AC_SUBST(LIBGNOMEUI_DEMOS_LIBS)
 
 dnl AC_SUBST GTK+ version
 GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
 AC_SUBST(GTK_VERSION)
 
-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/demos/Makefile.am b/demos/Makefile.am
index e19d9a3..25538ad 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -5,8 +5,7 @@ INCLUDES = \
 	-I$(top_builddir)/intl				\
 	-I$(top_srcdir)/libgnomeui			\
 	$(WARN_CFLAGS)					\
-	$(LIBGNOMECANVAS_CFLAGS)			\
-	$(GCONF_CFLAGS)					\
+	$(LIBGNOMEUI_DEMOS_CFLAGS)			\
         -DGNOMEUILIBDIR=\""$(libdir)"\" 		\
         -DGNOMEUIDATADIR=\""$(datadir)"\" 		\
         -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\"	\
@@ -18,7 +17,7 @@ INCLUDES = \
 
 LDADD =	\
 	$(top_builddir)/libgnomeui/libgnomeui-2.la \
-	$(INTLLIBS)
+	$(LIBGNOMEUI_DEMOS_LIBS)
 
 noinst_PROGRAMS = \
 	winhints_demo
diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
index f800eb5..3c2f270 100644
--- a/libgnomeui/Makefile.am
+++ b/libgnomeui/Makefile.am
@@ -31,9 +31,7 @@ INCLUDES = \
         -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\" 	\
 	-DG_LOG_DOMAIN=\"GnomeUI\"			\
 	$(WARN_CFLAGS)					\
-	$(LIBGNOME_CFLAGS)				\
-	$(LIBGNOMECANVAS_CFLAGS)			\
-	$(LIBBONOBOUI_CFLAGS)				\
+	$(LIBGNOMEUI_CFLAGS)				\
 	-DGTK_VERSION=\""$(GTK_VERSION)"\"		\
 	-DVERSION=\"$(VERSION)\"
 
@@ -217,9 +215,7 @@ libgnomeui_2_la_LDFLAGS = \
 	-version-info $(LIB_VERSION)
 
 libgnomeui_2_la_LIBADD = \
-	$(LIBGNOME_LIBS)			\
-	$(LIBGNOMECANVAS_LIBS)			\
-	$(LIBBONOBOUI_LIBS)
+	$(LIBGNOMEUI_LIBS)
 
 LDADD = \
 	libgnomeui-2.la