Merge 1.8.4 release commit.

[bpt/guile.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
dissimilarity index 82%
index 78c60db..ac5f75b 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,14 +1,40 @@
-#!/bin/sh
-
-[ -f GUILE-VERSION ] || {
-  echo "autogen.sh: run this command only at the top of a Guile source tree."
-  exit 1
-}
-
-aclocal -I .
-libtoolize --copy --automake --ltdl
-autoheader
-autoconf
-automake --add-missing
-
-( echo "guile-readline..."; cd guile-readline; ./autogen.sh )
+#!/bin/sh
+# Usage: sh -x ./autogen.sh
+
+set -e
+
+[ -f GUILE-VERSION ] || {
+  echo "autogen.sh: run this command only at the top of guile-core."
+  exit 1
+}
+
+######################################################################
+### announce build tool versions
+echo ""
+autoconf --version
+echo ""
+automake --version
+echo ""
+libtool --version
+echo ""
+${M4:-/usr/bin/m4} --version
+echo ""
+gnulib-tool --version
+echo ""
+
+######################################################################
+### update infrastructure
+
+gnulib-tool --update &&                                \
+autoreconf -i --force --verbose
+
+echo "guile-readline..."
+(cd guile-readline && ./autogen.sh)
+
+# Copy versions of config.guess and config.sub from Guile CVS to
+# build-aux and guile-readline.
+cp -f config.guess config.sub build-aux/
+cp -f config.guess config.sub guile-readline/
+
+echo "Now run configure and make."
+echo "You must pass the \`--enable-maintainer-mode' option to configure."