X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/99fd355abaf5faa55d0381eb0a6cb08431a74f0e..d8d9a8da05ec876acba81a559798eb5eeceb5a17:/autogen.sh

diff --git a/autogen.sh b/autogen.sh
dissimilarity index 89%
index c4924e6d8..2e39fb5d8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,110 +1,38 @@
-#!/bin/sh
-# Usage: sh -x ./autogen.sh [WORKBOOK]
-
-set -e
-
-[ -f GUILE-VERSION ] || {
-  echo "autogen.sh: run this command only at the top of guile-core."
-  exit 1
-}
-
-######################################################################
-### Find workbook and make symlinks.
-
-workbook=../workbook                    # assume "cvs co hack"
-test x$1 = x || workbook=$1
-if [ ! -d $workbook ] ; then
-    echo "ERROR: could not find workbook dir"
-    echo "       re-run like so: $0 WORKBOOK"
-    exit 1
-fi
-: found workbook at $workbook
-workbook=`(cd $workbook ; pwd)`
-
-workbookdistfiles="ANON-CVS HACKING SNAPSHOTS"
-for f in $workbookdistfiles ; do
-    rm -f $f
-    ln -s $workbook/build/dist-files/$f $f
-done
-rm -f examples/example.gdbinit
-ln -s $workbook/build/dist-files/.gdbinit examples/example.gdbinit
-
-# TODO: This should be moved to dist-guile
-mscripts=../guile-scripts
-rm -f BUGS
-$mscripts/render-bugs > BUGS
-
-######################################################################
-
-# Make sure this matches the ACLOCAL invokation in Makefile.am
-
-./guile-aclocal.sh
-
-######################################################################
-### Libtool setup.
-
-# Get a clean version.
-libtoolize --force --copy --automake
-
-######################################################################
-
-
-# configure.in reqs autoconf-2.53; try to find it
-for suf in "-2.53" "2.53" ""  false; do
-  version=`autoconf$suf --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
-  if test "0$version" -eq 253; then
-    autoconf=autoconf$suf
-    autoheader=autoheader$suf
-    break
-  fi
-done
-
-if test -z "$autoconf"; then
-    echo "ERROR: Please install autoconf 2.53"
-    exit 1
-fi
-################################################################
-
-#detect automake version
-
-
-# configure.in reqs autoconf-2.53; try to find it
-for suf in "-1.6" "1.6" ""  false; do
-  version=`automake$suf --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 10 + $2}'`
-  if test "0$version" -eq 16; then
-    automake=automake$suf
-    break
-  fi
-done
-
-if test -z "$automake"; then
-    echo "ERROR: Please install automake 1.6.x"
-    exit 1
-fi
-
-
-################################################################
-$autoheader
-$autoconf
-
-# Automake has a bug that will let it only add one copy of a missing
-# file.  We need two mdate-sh, tho, one in doc/ref/ and one in
-# doc/tutorial/.  We run automake twice as a workaround.
-
-$automake --add-missing
-$automake --add-missing
-
-# Make sure that libltdl uses the same autoconf version as the rest.
-#
-echo "libltdl..."
-(cd libltdl && aclocal)
-(cd libltdl && autoconf)
-(cd libltdl && $automake --gnu --add-missing)
-
-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."
-
-# autogen.sh ends here
+#!/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 ""
+
+# 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:-m4} --version
+echo ""
+flex --version
+echo ""
+
+######################################################################
+### update infrastructure
+
+autoreconf -i --force --verbose
+
+echo "Now run configure and make."