autoconf-2.60 is annoying. Add AC_CONFIG_HEADERS([config.h]) because it

wants it, and remove it afterwards because we don't need it.

svn path=/main/branches/prefix/; revision=4935

diff --git a/autogen.sh b/autogen.sh
index c55d02a0762b821638668c07cb7784648e0e3982..f933363cd3f2e24953609d29bd4ca5aebaaf1005 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,6 +7,7 @@ libtoolize --automake -c -f || { echo "failed libtoolize"; exit 1; }
 autoconf || { echo "failed autoconf"; exit 1; }
 touch ChangeLog 
 automake-1.8 -a -c || { "echo failed automake"; exit 1; }
+rm config.h.in
 
 if [ -x ./test.sh ] ; then
        exec ./test.sh "$@"

diff --git a/configure.in b/configure.in
index 096462b1233f20d43e0dd1f8527b446aec4298e2..9a7681fcfc88229921c14289dfc93362f8c2d943 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(portage, 2.1.13, kito@gentoo.org, portage-prefix)
+AC_INIT(portage, 2.1.20, grobian@gentoo.org, portage-prefix)
 
 dnl Define our precious vars
 dnl AC_ARG_VAR(prefix, the location portage will be installed to)
@@ -21,6 +21,7 @@ AC_CANONICAL_TARGET
 
 AM_INIT_AUTOMAKE
 dnl AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
 dnl Checks for programs.
 dnl store clfags prior, otherwise it's not propogaed.