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.

6 files changed, 54 insertions, 52 deletions

diff --git a/ChangeLog b/ChangeLog
index e69ec2f..6e0f3f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
+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  Brian Cameron <brian.cameron@sun.com>
+
 	* docs/atk-api.sgml docs/atk-sections.txt
 	docs/tmpl/atk-unused.sgml docs/tmpl/atkeditabletext.sgml
 	docs/tmpl/atktext.sgml
@@ -8,6 +22,7 @@
 	interfaces
 
 2001-06-06  Brian Cameron <brian.cameron@sun.com>
+
 	* atk/atktext.h atk/atktext.h
 	Updated to new atktext functions for getting attributes.
 
diff --git a/Makefile.am b/Makefile.am
index 7e76652..608af6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,8 @@
 
 SUBDIRS=atk tests docs
 
-EXTRA_DIST = 		\
+EXTRA_DIST = 			\
+	atk-uninstalled.pc.in	\
 	atk.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/atk-uninstalled.pc.in b/atk-uninstalled.pc.in
new file mode 100644
index 0000000..99e2e04
--- /dev/null
+++ b/atk-uninstalled.pc.in
@@ -0,0 +1,6 @@
+Name: Atk Uninstalled
+Description: Accessibility Toolkit, Not Installed
+Version: @VERSION@
+Requires: @GLIB_PACKAGES@ @PANGO_PACKAGES@
+Libs: ${pc_top_builddir}/${pcfiledir}/atk/libatk.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/atk/Makefile.am b/atk/Makefile.am
index 4d9bddb..f882687 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -69,14 +69,16 @@ atk.defs atkmarshal.h :	  # never add deps here
 	test -f "$(srcdir)/$@" || touch $(srcdir)/$@
 
 $(srcdir)/stamp-atkmarshal.h: @REBUILD@ atkmarshal.list atkmarshal.h
-	cd $(srcdir) \
-	&& glib-genmarshal --prefix=atk_marshal atkmarshal.list --header >> xgen-gmh \
+	cwd=`pwd` \
+	&& cd $(srcdir) \
+	&& $$cwd/@GLIB_GENMARSHAL@ --prefix=atk_marshal atkmarshal.list --header >> xgen-gmh \
 	&& (cmp -s xgen-gmh atkmarshal.h || cp xgen-gmh atkmarshal.h) \
 	&& rm -f xgen-gmh xgen-gmh~ \
 	&& echo timestamp > $(@F)
 $(srcdir)/atkmarshal.c: @REBUILD@ $(srcdir)/stamp-atkmarshal.h
-	cd $(srcdir) \
-	&& glib-genmarshal --prefix=atk_marshal atkmarshal.list --body >> xgen-gmc \
+	cwd=`pwd` \
+	&& cd $(srcdir) \
+	&& $$cwd/@GLIB_GENMARSHAL@ --prefix=atk_marshal atkmarshal.list --body >> xgen-gmc \
 	&& cp xgen-gmc atkmarshal.c \
 	&& rm -f xgen-gmc xgen-gmc~
 
diff --git a/autogen.sh b/autogen.sh
index d95d684..14b21f2 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 52038dc..c1de6e1 100644
--- a/configure.in
+++ b/configure.in
@@ -24,57 +24,31 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-
-#
-# 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
-
 GLIB_PACKAGES="gobject-2.0 gmodule-2.0 gthread-2.0"
 AC_SUBST(GLIB_PACKAGES)
 GLIB_REQUIRED_VERSION=1.3.2
 
-AC_MSG_CHECKING(GLib version)
-if $PKG_CONFIG --atleast-version $GLIB_REQUIRED_VERSION glib-2.0 ; then
-    AC_MSG_RESULT(yes)
-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
-
 PANGO_PACKAGES="pango"
 AC_SUBST(PANGO_PACKAGES)
 
-# Check for Pango flags
+dnl This PATH_GLIB is somewhat redundant, but does a sanity compile and 
+dnl importantly defines the GLIB_GENMARSHAL variable for subst into the
+dnl Makefile
+AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION)
+
+PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES $PANGO_PACKAGES, , AC_MSG_ERROR([
+        *** GLib or Pango not found. You can find these on ftp://ftp.gtk.org
+        *** Errors follow:
+            $DEP_PKG_ERRORS]))
 
-AC_MSG_CHECKING(Pango version)
-if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
-        AC_MSG_RESULT(yes)
+if $PKG_CONFIG --uninstalled $GLIB_PACKAGES $PANGO_PACKAGES; then
+        :
 else
-        AC_MSG_ERROR([
-*** Pango not found. Pango is required to build ATK.
-*** See http://www.pango.org for Pango information.
-])
+        AC_CHECK_LIB(pango, pango_context_new, :, AC_MSG_ERROR([
+                *** Can't link to Pango. Pango is required to build
+                *** GTK+. For more information see http://www.pango.org]), $DEP_LIBS)
 fi
 
-DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES $PANGO_PACKAGES`
-DEP_LIBS=`$PKG_CONFIG --libs $GLIB_PACKAGES $PANGO_PACKAGES`
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
-
-AC_CHECK_LIB(pango, pango_context_new, :, AC_MSG_ERROR([
-*** Can't link to Pango. Pango is required to build
-*** GTK+. For more information see http://www.pango.org]), $DEP_LIBS)
-
 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
 
 gtk_doc_min_version=0.6
@@ -122,10 +96,10 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
-
 AC_OUTPUT([
 Makefile
 atk.pc
+atk-uninstalled.pc
 atk/Makefile
 tests/Makefile
 docs/Makefile