X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/0859b96a4e87504b2718b71c770c6df3604cfecd..cbec54af5d4448eaf76c7315d43f61d2117a7e0d:/autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 4f448f95a..b05c719a6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,7 +21,7 @@ fi
 : found workbook at $workbook
 workbook=`(cd $workbook ; pwd)`
 
-workbookdistfiles="ANON-CVS HACKING INSTALL SNAPSHOTS"
+workbookdistfiles="ANON-CVS HACKING SNAPSHOTS"
 for f in $workbookdistfiles ; do
     rm -f $f
     ln -s $workbook/build/dist-files/$f $f
@@ -30,50 +30,18 @@ rm -f examples/example.gdbinit
 ln -s $workbook/build/dist-files/.gdbinit examples/example.gdbinit
 
 # TODO: This should be moved to dist-guile
-mscripts=$workbook/../scripts
+mscripts=../guile-scripts
 rm -f BUGS
 $mscripts/render-bugs > BUGS
 
 ######################################################################
+### update infrastructure
 
-# Make sure this matches the ACLOCAL invokation in Makefile.am
-
-./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 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 && autoconf)
-(cd libltdl && automake --gnu --add-missing)
+libtoolize --force --copy --ltdl  # autoreconf doesn't seem to update libltdl/
+autoreconf -i --force
 
 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