X-Git-Url: https://git.hcoop.net/bpt/guile.git/blobdiff_plain/e610dc3851da716e6ee4568f94f5f7cace84d2d9..HEAD:/autogen.sh

diff --git a/autogen.sh b/autogen.sh
index d125d9f48..2e39fb5d8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,26 +15,24 @@ autoconf --version
 echo ""
 automake --version
 echo ""
-libtool --version
+
+# Typical MacOS X installations rename 'libtoolize' to 'glibtoolize', so
+# adjust to that.
+if test "`uname -s`" = "Darwin"; then
+  glibtoolize --version
+else
+  libtoolize --version
+fi
+
 echo ""
-${M4:-/usr/bin/m4} --version
+${M4:-m4} --version
 echo ""
-gnulib-tool --version
+flex --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's repository 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."