diff options
author | Rob Browning <rlb@defaultvalue.org> | 2002-10-05 04:55:57 +0000 |
---|---|---|
committer | Rob Browning <rlb@defaultvalue.org> | 2002-10-05 04:55:57 +0000 |
commit | 39eef5091d22dab77b928cc9a05928e369a98916 (patch) | |
tree | afb2d6f23b3dfae6819eb386baedf7d016b03579 /autogen.sh | |
parent | 1c09a4c30ff9f5d00a89a63d3645c1d98929ef7f (diff) | |
download | guile-39eef5091d22dab77b928cc9a05928e369a98916.tar.gz |
* autogen.sh: remove support for libltdl sub-configure.
(ac_version): widen support check to any 2.5? autoconf version.
2.54 is out now.
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/autogen.sh b/autogen.sh index c4924e6d8..a99f69987 100755 --- a/autogen.sh +++ b/autogen.sh @@ -48,16 +48,23 @@ libtoolize --force --copy --automake ###################################################################### +ac_version=`autoconf --version | head -1` +ac_version=`echo ${ac_version} | sed -e 's/autoconf.* \([0-9].[0-9]\+\)$/\1/'` +case "${ac_version}" in + (2.5?) autoconf=autoconf ;; +esac # 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 + 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 +fi if test -z "$autoconf"; then echo "ERROR: Please install autoconf 2.53" @@ -94,13 +101,6 @@ $autoconf $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) |