-#!/bin/sh
-
-export ACLOCAL_AMFLAGS=
-if test ! -f "`aclocal --print-ac-dir`/guile.m4"; then
- if test -f "`guile-config info datadir`/aclocal/guile.m4"; then
- ACLOCAL_AMFLAGS="-I `guile-config info datadir`/aclocal"
- else
- echo "warning: cannot find guile.m4";
- fi
-fi
-
-autoreconf -vif
+#!/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 ""
+if test "`uname -s`" = Darwin; then
+ glibtool --version
+else
+ libtool --version
+fi
+echo ""
+${M4:-m4} --version
+echo ""
+
+######################################################################
+### update infrastructure
+
+autoreconf -i --force --verbose
+
+echo "Now run configure and make."