*** empty log message ***

[bpt/guile.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 4f448f9..c4924e6 100755 (executable)
--- 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,7 +30,7 @@ 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
 
@@ -44,31 +44,62 @@ $mscripts/render-bugs > BUGS
 ### 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
+libtoolize --force --copy --automake
+
 ######################################################################
 
-autoheader
-autoconf
+
+# 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
+$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)
+(cd libltdl && $automake --gnu --add-missing)
 
 echo "guile-readline..."
 (cd guile-readline && ./autogen.sh)