bump minimum required autoconf version and revise autogen.sh
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
diff --git a/autogen.sh b/autogen.sh
index 9edfb8a..daf160d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-#
+
echo "Generating build information using autoconf"
echo "This may take a while ..."
@@ -9,15 +9,15 @@ cd "$srcdir"
# Regenerate configuration files
cat acinclude/* >aclocal.m4
-found=false
-for autoconf in autoconf autoconf259 autoconf-2.59
-do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
-done
-if test x$found = xfalse; then
- echo "Couldn't find autoconf, aborting"
- exit 1
+
+if test "$AUTOCONF"x = x; then
+ AUTOCONF=autoconf
fi
+
+$AUTOCONF || exit 1
+rm aclocal.m4
+rm -rf autom4te.cache
+
(cd test; sh autogen.sh)
-# Run configure for this platform
echo "Now you are ready to run ./configure"
diff --git a/configure.ac b/configure.ac
index 33dcd5a..b6783a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.59])
+AC_PREREQ([2.63])
AC_INIT
AC_CONFIG_SRCDIR([src/SDL.c])
AC_CONFIG_HEADERS([include/SDL_config.h])
diff --git a/test/autogen.sh b/test/autogen.sh
index 939f34c..988d417 100755
--- a/test/autogen.sh
+++ b/test/autogen.sh
@@ -1,12 +1,11 @@
#!/bin/sh
-#
-# Regenerate configuration files
+
cp acinclude.m4 aclocal.m4
-found=false
-for autoconf in autoconf autoconf259 autoconf-2.59
-do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
-done
-if test x$found = xfalse; then
- echo "Couldn't find autoconf, aborting"
- exit 1
+
+if test "$AUTOCONF"x = x; then
+ AUTOCONF=autoconf
fi
+
+$AUTOCONF || exit 1
+rm aclocal.m4
+rm -rf autom4te.cache