2002-02-03 Havoc Pennington <hp@pobox.com>

Author: hp
Date: 2002-02-03 17:53:47 GMT
2002-02-03  Havoc Pennington  <hp@pobox.com>

	* configure.in: 0.10.0

	* autogen.sh: rerun autoconf/libtoolize in glib subdir so that
	auto* version matches in subdir and top dir.

diff --git a/ChangeLog b/ChangeLog
index e89e821640b57ace54d995d27b7c7ad0b176a9ab..6712e8850e36aa8ad15886f4051baf5dd5b92e39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-03  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in: 0.10.0
+
+       * autogen.sh: rerun autoconf/libtoolize in glib subdir so that 
+       auto* version matches in subdir and top dir.
+
 2002-02-03  Havoc Pennington  <hp@pobox.com>
 
        * pkg.m4: require 0.9.0

diff --git a/autogen.sh b/autogen.sh
index 3bf4085e4e9e2fc70f96c8cd289e8a8c2166c852..77f794aea1fb7e34c07ee9d81f4ca1441cd2e1bb 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -59,7 +59,7 @@ perl -p -i.bak -e "s/[a-zA-Z0-9]+_DATA/noinst_DATA/g" `find glib-1.2.8 -name Mak
 perl -p -i.bak -e "s/info_TEXINFOS/noinst_TEXINFOS/g" `find glib-1.2.8 -name Makefile.am`
 perl -p -i.bak -e "s/man_MANS/noinst_MANS/g" `find glib-1.2.8 -name Makefile.am`
 
-(cd glib-1.2.8 && $AUTOMAKE)
+(cd glib-1.2.8 && libtoolize --copy --force && $ACLOCAL $ACLOCAL_FLAGS && $AUTOMAKE && autoconf)
 
 if test -z "$*"; then
        echo "I am going to run ./configure with no arguments - if you wish "

diff --git a/configure.in b/configure.in
index 7311a9ee1f4f9aa71b5031fab20e5b6ae458e6e0..dc9ad93db136cc35c87876230e814406c5710236 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 
 AC_INIT(pkg-config.1)
 
-AM_INIT_AUTOMAKE(pkgconfig, 0.9.0)
+AM_INIT_AUTOMAKE(pkgconfig, 0.10.0)
 AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)