put creation of module file here. Fixes problem if you 'make install' with

2001-01-04  Havoc Pennington  <hp@redhat.com>

	* pango/Makefile.am (install-data-local): put creation of module
	file here. Fixes problem if you 'make install' with no preceding
	'make' reported by Michael Meeks.

	* modules/Makefile.am (install-data-local): remove creation of module file
	from here

	* Makefile.am (SUBDIRS): remove pango-config

	* configure.in: use pkg-config to detect GLib cflags/libs

	* pangoxft.pc (Description): fix name/description

11 files changed, 145 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 1dc4f513..1554297c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2001-01-04  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am (install-data-local): put creation of module
+	file here. Fixes problem if you 'make install' with no preceding
+	'make' reported by Michael Meeks.
+
+	* modules/Makefile.am (install-data-local): remove creation of module file
+	from here
+
+	* Makefile.am (SUBDIRS): remove pango-config
+
+	* configure.in: use pkg-config to detect GLib cflags/libs
+
+	* pangoxft.pc (Description): fix name/description
+
 2001-01-04  Alexander Larsson  <alla@lysator.liu.se>
 
 	* modules/arabic/arabic-x.c:
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 1dc4f513..1554297c 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,18 @@
+2001-01-04  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am (install-data-local): put creation of module
+	file here. Fixes problem if you 'make install' with no preceding
+	'make' reported by Michael Meeks.
+
+	* modules/Makefile.am (install-data-local): remove creation of module file
+	from here
+
+	* Makefile.am (SUBDIRS): remove pango-config
+
+	* configure.in: use pkg-config to detect GLib cflags/libs
+
+	* pangoxft.pc (Description): fix name/description
+
 2001-01-04  Alexander Larsson  <alla@lysator.liu.se>
 
 	* modules/arabic/arabic-x.c:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 1dc4f513..1554297c 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,18 @@
+2001-01-04  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am (install-data-local): put creation of module
+	file here. Fixes problem if you 'make install' with no preceding
+	'make' reported by Michael Meeks.
+
+	* modules/Makefile.am (install-data-local): remove creation of module file
+	from here
+
+	* Makefile.am (SUBDIRS): remove pango-config
+
+	* configure.in: use pkg-config to detect GLib cflags/libs
+
+	* pangoxft.pc (Description): fix name/description
+
 2001-01-04  Alexander Larsson  <alla@lysator.liu.se>
 
 	* modules/arabic/arabic-x.c:
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 1dc4f513..1554297c 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,18 @@
+2001-01-04  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am (install-data-local): put creation of module
+	file here. Fixes problem if you 'make install' with no preceding
+	'make' reported by Michael Meeks.
+
+	* modules/Makefile.am (install-data-local): remove creation of module file
+	from here
+
+	* Makefile.am (SUBDIRS): remove pango-config
+
+	* configure.in: use pkg-config to detect GLib cflags/libs
+
+	* pangoxft.pc (Description): fix name/description
+
 2001-01-04  Alexander Larsson  <alla@lysator.liu.se>
 
 	* modules/arabic/arabic-x.c:
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 1dc4f513..1554297c 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,18 @@
+2001-01-04  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am (install-data-local): put creation of module
+	file here. Fixes problem if you 'make install' with no preceding
+	'make' reported by Michael Meeks.
+
+	* modules/Makefile.am (install-data-local): remove creation of module file
+	from here
+
+	* Makefile.am (SUBDIRS): remove pango-config
+
+	* configure.in: use pkg-config to detect GLib cflags/libs
+
+	* pangoxft.pc (Description): fix name/description
+
 2001-01-04  Alexander Larsson  <alla@lysator.liu.se>
 
 	* modules/arabic/arabic-x.c:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 1dc4f513..1554297c 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,18 @@
+2001-01-04  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am (install-data-local): put creation of module
+	file here. Fixes problem if you 'make install' with no preceding
+	'make' reported by Michael Meeks.
+
+	* modules/Makefile.am (install-data-local): remove creation of module file
+	from here
+
+	* Makefile.am (SUBDIRS): remove pango-config
+
+	* configure.in: use pkg-config to detect GLib cflags/libs
+
+	* pangoxft.pc (Description): fix name/description
+
 2001-01-04  Alexander Larsson  <alla@lysator.liu.se>
 
 	* modules/arabic/arabic-x.c:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 1dc4f513..1554297c 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,18 @@
+2001-01-04  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am (install-data-local): put creation of module
+	file here. Fixes problem if you 'make install' with no preceding
+	'make' reported by Michael Meeks.
+
+	* modules/Makefile.am (install-data-local): remove creation of module file
+	from here
+
+	* Makefile.am (SUBDIRS): remove pango-config
+
+	* configure.in: use pkg-config to detect GLib cflags/libs
+
+	* pangoxft.pc (Description): fix name/description
+
 2001-01-04  Alexander Larsson  <alla@lysator.liu.se>
 
 	* modules/arabic/arabic-x.c:
diff --git a/Makefile.am b/Makefile.am
index b3b42e8f..71d3ac1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,8 @@
 
 SUBDIRS=modules pango examples docs tools fonts
 
-bin_SCRIPTS = pango-config
-
 EXTRA_DIST = 		\
 	pango.spec.in	\
-	pango-config.in	\
 	pango.pc.in	\
 	pangox.pc.in	\
 	pangoxft.pc.in	\
diff --git a/configure.in b/configure.in
index ebef855b..a077b8d4 100644
--- a/configure.in
+++ b/configure.in
@@ -46,6 +46,20 @@ fi
 
 X_LIBS="$X_LIBS -lX11"
 
+
+#
+# Find pkg-config
+#
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test x$PKG_CONFIG = xno ; then
+  AC_MSG_ERROR([*** pkg-config not found. See http://pkgconfig.sourceforge.net])
+fi
+
+if ! pkg-config --atleast-pkgconfig-version 0.5 ; then
+  AC_MSG_ERROR([*** pkg-config too old; version 0.5 or better required.])
+fi
+
+
 #
 # Checks for FreeType
 #
@@ -86,17 +100,24 @@ AM_CONDITIONAL(HAVE_XFT, $have_xft)
 #
 # Checks for GLib
 #
-AM_PATH_GLIB_2_0(1.3.1,,
-                 AC_MSG_ERROR([GLib 1.3.1 is required for building Pango]),
-	         gmodule gobject)
+GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
+GLIB_REQUIRED_VERSION=1.3.2
+
+AC_MSG_CHECKING(GLib flags)
+if $PKG_CONFIG --atleast-version $GLIB_REQUIRED_VERSION glib-2.0 ; then
+      GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES`
+      GLIB_LIBS=`$PKG_CONFIG --libs $GLIB_PACKAGES`
 
-AC_PATH_PROG(GLIB_CONFIG, glib-config-2.0, no)
-if test x$GLIB_CONFIG = xno ; then
-  AC_MSG_ERROR([*** glib-config-2.0 not found])
+      AC_MSG_RESULT($GLIB_CFLAGS $GLIB_LIBS)
+else
+      AC_MSG_ERROR([
+*** GLIB $GLIB_REQUIRED_VERSION or newer is required. The latest version of GLIB
+*** is always available from ftp://ftp.gtk.org/.
+  ])
 fi
-GLIB_CFLAGS="`$GLIB_CONFIG --cflags gmodule gobject`"
+
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
-GLIB_LIBS="`$GLIB_CONFIG --libs gmodule gobject`"
+
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 
@@ -427,7 +448,6 @@ tools/Makefile
 fonts/Makefile
 tests/Makefile
 pango.spec
-pango-config
 pango.pc
 pangox.pc
 pangoxft.pc
diff --git a/modules/Makefile.am b/modules/Makefile.am
index b031ac88..3e71db7e 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -8,18 +8,5 @@ SUBDIRS = 		\
 	tamil 		\
 	thai
 
-
-
-install-data-local:
-	($(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango; \
-	if ls $(DESTDIR)$(libdir)/pango/modules/*.so | grep -q 'so'; then \
-          echo "Wrote $(DESTDIR)$(sysconfdir)/pango/pango.modules."; \
-          $(top_builddir)/pango/pango-querymodules $(DESTDIR)$(libdir)/pango/modules/*.so \
-		> $(DESTDIR)$(sysconfdir)/pango/pango.modules; \
-        else \
-          echo "No dynamic modules were installed; all modules were linked statically."; \
-	  echo "# This is an empty file, because Pango was installed with no dynamic modules" > $(DESTDIR)$(sysconfdir)/pango/pango.modules; \
-        fi)
-
 EXTRA_DIST =		\
 	module.def
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 56e03616..aa8a40de 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -174,3 +174,14 @@ EXTRA_DIST =			\
 	pangowin32.rc		\
 	pangowin32.rc.in
 
+
+install-data-local:
+	($(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango; \
+	if ls $(DESTDIR)$(libdir)/pango/modules/*.so | grep -q 'so'; then \
+          echo "Wrote $(DESTDIR)$(sysconfdir)/pango/pango.modules."; \
+          $(top_builddir)/pango/pango-querymodules $(DESTDIR)$(libdir)/pango/modules/*.so \
+		> $(DESTDIR)$(sysconfdir)/pango/pango.modules; \
+        else \
+          echo "No dynamic modules were installed; all modules were linked statically."; \
+	  echo "# This is an empty file, because Pango was installed with no dynamic modules" > $(DESTDIR)$(sysconfdir)/pango/pango.modules; \
+        fi)