From b4d86ecd8fe68ef02c1c09f00049f17b603600e7 Mon Sep 17 00:00:00 2001
From: Rob Browning <rlb@defaultvalue.org>
Date: Mon, 25 Feb 2002 04:26:24 +0000
Subject: [PATCH] * autogen.sh: make absolutely sure we can't have stale files
 from old versions lying around the libltdl dir since libtoolize doesn't. 
 Also hack libltdl's configure.in to require autoconf 2.5 so the main tree and
 libltdl can't get out of sync again.

---
 autogen.sh | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 2f329982b..163fb9359 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 [ -f GUILE-VERSION ] || {
   echo "autogen.sh: run this command only at the top of a Guile source tree."
   exit 1
@@ -7,16 +9,32 @@
 
 ./guile-aclocal.sh
 
+######################################################################
+### Libtool setup.
+
+# Get a clean version.
+rm -rf libltdl
 libtoolize --force --copy --automake --ltdl
+
+# Make sure we use a ./configure.in compatible autoconf in ./libltdl/
+mv libltdl/configure.in libltdl/configure.tmp
+echo 'AC_PREREQ(2.50)' > libltdl/configure.in
+cat libltdl/configure.tmp >> libltdl/configure.in
+rm libltdl/configure.tmp
+######################################################################
+
 autoheader
 autoconf
 automake --add-missing
 
 # Make sure that libltdl uses the same autoconf version as the rest.
 #
-( echo "libltdl..."; cd libltdl; autoconf )
+echo "libltdl..."
+(cd libltdl && autoconf)
+(cd libltdl && automake --gnu --add-missing)
 
-( echo "guile-readline..."; cd guile-readline; ./autogen.sh )
+echo "guile-readline..."
+(cd guile-readline && ./autogen.sh)
 
 echo "Now run configure and make."
 echo "You must pass the \`--enable-maintainer-mode' option to configure."