*** empty log message ***

[bpt/guile.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index a41df11..c4924e6 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -44,63 +44,62 @@ $mscripts/render-bugs > BUGS
 ### Libtool setup.
 
 # Get a clean version.
-rm -rf libltdl
-libtoolize --force --copy --automake --ltdl
-
-# Fix older versions of libtool.
-# Make sure we use a ./configure.in compatible autoconf in ./libltdl/
-if [ -f libltdl/configure.in ]; then
-       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
+
+######################################################################
+
+
+# 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
+################################################################
 
-# Maybe patch ltdl.c.  This is only needed for 1.4.2 and earlier.
-if patch libltdl/ltdl.c <<EOP
---- ltdl.c~    Fri Apr 12 18:52:48 2002
-+++ ltdl.c     Tue Jul  9 14:12:47 2002
-@@ -2246,15 +2246,15 @@
- static int
- find_handle_callback (filename, data, ignored)
-      char *filename;
-      lt_ptr data;
-      lt_ptr ignored;
- {
-   lt_dlhandle  *handle        = (lt_dlhandle *) data;
--  int         found   = access (filename, R_OK);
-+  int         found   = !access (filename, F_OK);
- 
-   /* Bail out if file cannot be read...  */
-   if (!found)
-     return 0;
- 
-   /* Try to dlopen the file, but do not continue searching in any
-      case.  */
-EOP
-then true
-else
-   echo "WARNING: could not patch libltdl, but this is probably OK."
+#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
+################################################################
+$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)