- attempt to make peace with automake-1.6.1, autoconf-2.53.

- rip out two layers of dbN gook, internal Berkeley db is here to stay.

CVS patchset: 5412
CVS date: 2002/05/01 22:13:00

1 files changed, 9 insertions, 8 deletions

diff --git a/autogen.sh b/autogen.sh
index ede543749..7dbbaa517 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,13 +4,13 @@ export CFLAGS
 export LDFLAGS
 
 LTV="libtoolize (GNU libtool) 1.4.2"
-ACV="autoconf (GNU Autoconf) 2.52"
-AMV="automake (GNU automake) 1.5"
+ACV="autoconf (GNU Autoconf) 2.53"
+AMV="automake (GNU automake) 1.6.1"
 USAGE="
 This script documents the versions of the tools I'm using to build rpm:
 	libtool-1.4.2
-	autoconf-2.52
-	automake-1.5
+	autoconf-2.53
+	automake-1.6.1
 Simply edit this script to change the libtool/autoconf/automake versions
 checked if you need to, as rpm should build (and has built) with all
 recent versions of libtool/autoconf/automake.
@@ -20,13 +20,14 @@ recent versions of libtool/autoconf/automake.
 [ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" && exit 1
 [ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" && exit 1
 
-(cd popt; ./autogen.sh --noconfigure "$@")
-(cd zlib; ./autogen.sh --noconfigure "$@")
-(cd beecrypt; ./autogen.sh --noconfigure "$@")
+(echo "--- popt"; cd popt; ./autogen.sh --noconfigure "$@")
+(echo "--- zlib"; cd zlib; ./autogen.sh --noconfigure "$@")
+(echo "--- beecrypt"; cd beecrypt; ./autogen.sh --noconfigure "$@")
+
 libtoolize --copy --force
 aclocal
 autoheader
-automake
+automake -a -c
 autoconf
 
 if [ "$1" = "--noconfigure" ]; then