subst GLIB_GENMARSHAL, GOBJECT_QUERY, GLIB_MKENUMS variables

2001-06-07  Havoc Pennington  <hp@redhat.com>

	* m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
	GLIB_MKENUMS variables

	* gmodule-2.0.pc.in: add gmodule_supported variable

	* glib-2.0.pc.in: add glib_genmarshal, gobject_query,
	glib_mkenums variables

	* configure.in: put G_MODULE_SUPPORTED value into
	.pc files

	* autogen.sh: support AUTOGEN_SUBDIR_MODE

	* Makefile.am: add -uninstalled.pc.in to EXTRA_DIST

2001-06-07  Havoc Pennington  <hp@redhat.com>

	* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
	other libs

	* configure.in: use AM_PATH_GLIB_2_0

	* autogen.sh: support AUTOGEN_SUBDIR_MODE

	* Makefile.am: dist the .pc.in files

2001-06-07  Havoc Pennington  <hp@redhat.com>

	* atk/Makefile.am: use @GLIB_GENMARSHAL@ so we can use uninstalled
	glib-genmarshal

	* configure.in: rearrange the library checks to support
	uninstalled linking

	* autogen.sh: add support for AUTOGEN_SUBDIR_MODE

	* atk-uninstalled.pc.in: new file, allows linking to uninstalled
	ATK in giant GTK tarball

2001-06-07  Havoc Pennington  <hp@redhat.com>

	* tests/Makefile.am: add missing -I flag

	* gtk/Makefile.am: use @GLIB_MKENUMS@, @GLIB_GENMARSHAL@, etc.

	* configure.in: use pkg-config to see if GModule is
	supported; fix to properly turn on included loaders
	when GModule isn't supported; don't use AC_CHECK_LIB
	when libs are not installed yet

	* autogen.sh: add support for AUTOGEN_SUBDIR_MODE

	* Makefile.am (SUBDIRS): add m4macros subdir

	* gtk/Makefile.am: $(srcdir)/foo targets must be $(srcdir)/foo in
	dependencies also.

15 files changed, 126 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 43444441..1bd8715e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-06-07  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
+	other libs
+
+	* configure.in: use AM_PATH_GLIB_2_0
+
+	* autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+	* Makefile.am: dist the .pc.in files
+
 Tue Jun  5 10:40:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* docs/reference/tmpl/*.smgl: Patch from Matthias 
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 43444441..1bd8715e 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,14 @@
+2001-06-07  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
+	other libs
+
+	* configure.in: use AM_PATH_GLIB_2_0
+
+	* autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+	* Makefile.am: dist the .pc.in files
+
 Tue Jun  5 10:40:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* docs/reference/tmpl/*.smgl: Patch from Matthias 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 43444441..1bd8715e 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,14 @@
+2001-06-07  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
+	other libs
+
+	* configure.in: use AM_PATH_GLIB_2_0
+
+	* autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+	* Makefile.am: dist the .pc.in files
+
 Tue Jun  5 10:40:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* docs/reference/tmpl/*.smgl: Patch from Matthias 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 43444441..1bd8715e 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,14 @@
+2001-06-07  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
+	other libs
+
+	* configure.in: use AM_PATH_GLIB_2_0
+
+	* autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+	* Makefile.am: dist the .pc.in files
+
 Tue Jun  5 10:40:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* docs/reference/tmpl/*.smgl: Patch from Matthias 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 43444441..1bd8715e 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,14 @@
+2001-06-07  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
+	other libs
+
+	* configure.in: use AM_PATH_GLIB_2_0
+
+	* autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+	* Makefile.am: dist the .pc.in files
+
 Tue Jun  5 10:40:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* docs/reference/tmpl/*.smgl: Patch from Matthias 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 43444441..1bd8715e 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,14 @@
+2001-06-07  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
+	other libs
+
+	* configure.in: use AM_PATH_GLIB_2_0
+
+	* autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+	* Makefile.am: dist the .pc.in files
+
 Tue Jun  5 10:40:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* docs/reference/tmpl/*.smgl: Patch from Matthias 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 43444441..1bd8715e 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,14 @@
+2001-06-07  Havoc Pennington  <hp@redhat.com>
+
+	* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
+	other libs
+
+	* configure.in: use AM_PATH_GLIB_2_0
+
+	* autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+	* Makefile.am: dist the .pc.in files
+
 Tue Jun  5 10:40:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* docs/reference/tmpl/*.smgl: Patch from Matthias 
diff --git a/Makefile.am b/Makefile.am
index b77503ef..c2f10ad1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,10 @@ EXTRA_DIST = 		\
 	pangox.pc.in	\
 	pangoxft.pc.in	\
 	pangoft2.pc.in	\
+	pango-uninstalled.pc.in		\
+	pangox-uninstalled.pc.in	\
+	pangoxft-uninstalled.pc.in	\
+	pangoft2-uninstalled.pc.in	\
 	TODO.xml	\
 	README.win32
 
diff --git a/autogen.sh b/autogen.sh
index 25055a5d..6111abf8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -65,9 +65,11 @@ test $TEST_TYPE $FILE || {
 	exit 1
 }
 
-if test -z "$*"; then
-	echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+        if test -z "$*"; then
+                echo "I am going to run ./configure with no arguments - if you wish "
+                echo "to pass any to it, please specify them on the $0 command line."
+        fi
 fi
 
 aclocal $ACLOCAL_FLAGS
@@ -79,7 +81,9 @@ automake -a $am_opt
 autoconf
 cd $ORIGDIR
 
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+        $srcdir/configure --enable-maintainer-mode "$@"
 
-echo 
-echo "Now type 'make' to compile $PROJECT."
+        echo 
+        echo "Now type 'make' to compile $PROJECT."
+fi
\ No newline at end of file
diff --git a/configure.in b/configure.in
index 05fbcd67..255a7a4c 100644
--- a/configure.in
+++ b/configure.in
@@ -51,19 +51,6 @@ fi
 AM_CONDITIONAL(HAVE_X, $have_x) 
 
 #
-# 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
 #
 FREETYPE_LIBS=
@@ -132,21 +119,7 @@ AM_CONDITIONAL(HAVE_XFT, $have_xft)
 #
 # Checks for GLib
 #
-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_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
+AM_PATH_GLIB_2_0(1.3.5,,,gobject gmodule)
 
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
 
@@ -508,6 +481,10 @@ pango.pc
 pangox.pc
 pangoft2.pc
 pangoxft.pc
+pango-uninstalled.pc
+pangox-uninstalled.pc
+pangoft2-uninstalled.pc
+pangoxft-uninstalled.pc
 ],[case "$CONFIG_FILES" in
 *pango-config*)chmod +x pango-config;;
 esac])
diff --git a/pango-uninstalled.pc.in b/pango-uninstalled.pc.in
new file mode 100644
index 00000000..c1bc7202
--- /dev/null
+++ b/pango-uninstalled.pc.in
@@ -0,0 +1,7 @@
+Name: Pango Uninstalled
+Description: Internationalized text handling, Not Installed
+Version: @VERSION@
+Requires: @FRIBIDI_PC@glib-2.0,gobject-2.0,gmodule-2.0
+Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpango.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
+
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 02d13254..6b2028bc 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -96,7 +96,7 @@ endif
 
 libpangox_la_LDFLAGS = -release $(VERSION)
 libpangox_la_LIBADD =  $(INCLUDED_X_MODULES) $(X_LIBS) libpango.la
-libpangox_la_DEPENDENCIES = $(INCLUDED_X_MODULES)
+libpangox_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango.la
 
 libpangoxft_la_SOURCES =   	\
 	pangoxft-font.c		\
@@ -106,7 +106,7 @@ libpangoxft_la_SOURCES =   	\
 
 libpangoxft_la_LIBADD = $(INCLUDED_XFT_MODULES) $(XFT_LIBS) opentype/libpango-ot.la libpango.la
 libpangoxft_la_LDFLAGS = -release $(VERSION)
-libpangoxft_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES)
+libpangoxft_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango.la
 
 libpangoft2_la_SOURCES =   	\
 	pangoft2.h		\
@@ -118,7 +118,7 @@ libpangoft2_la_SOURCES =   	\
 
 libpangoft2_la_LIBADD = $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) libpango.la
 libpangoft2_la_LDFLAGS = -release $(VERSION)
-libpangoft2_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES)
+libpangoft2_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango.la
 
 pangoincludedir=$(includedir)/pango-1.0/pango
 
diff --git a/pangoft2-uninstalled.pc.in b/pangoft2-uninstalled.pc.in
new file mode 100644
index 00000000..c9f56893
--- /dev/null
+++ b/pangoft2-uninstalled.pc.in
@@ -0,0 +1,7 @@
+Name: Pango FT2 Uninstalled
+Description: Freetype 2.0 font support for Pango, Not Installed
+Version: @VERSION@
+Requires: pango
+Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2.la @FREETYPE_LIBS@
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @FREETYPE_CFLAGS@
+
diff --git a/pangox-uninstalled.pc.in b/pangox-uninstalled.pc.in
new file mode 100644
index 00000000..148670fa
--- /dev/null
+++ b/pangox-uninstalled.pc.in
@@ -0,0 +1,6 @@
+Name: Pango X Uninstalled
+Description: X Window System font support for Pango, Not Installed
+Version: @VERSION@
+Requires: pango
+Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangox.la @X_LIBS@
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/pangoxft-uninstalled.pc.in b/pangoxft-uninstalled.pc.in
new file mode 100644
index 00000000..412f49e9
--- /dev/null
+++ b/pangoxft-uninstalled.pc.in
@@ -0,0 +1,7 @@
+Name: Pango X Uninstalled
+Description: X Window System font support for Pango, Not Installed
+Version: @VERSION@
+Requires: pango
+Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft.la @XFT_LIBS@
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@ @FREETYPE_CFLAGS@
+