mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
* autogen.sh: remove support for libltdl sub-configure.
(ac_version): widen support check to any 2.5? autoconf version. 2.54 is out now.
This commit is contained in:
parent
1c09a4c30f
commit
39eef5091d
1 changed files with 15 additions and 15 deletions
30
autogen.sh
30
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
|
# configure.in reqs autoconf-2.53; try to find it
|
||||||
for suf in "-2.53" "2.53" "" false; do
|
if test -z "$autoconf"; then
|
||||||
version=`autoconf$suf --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
|
for suf in "-2.53" "2.53" "" false; do
|
||||||
if test "0$version" -eq 253; then
|
version=`autoconf$suf --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
|
||||||
autoconf=autoconf$suf
|
if test "0$version" -eq 253; then
|
||||||
autoheader=autoheader$suf
|
autoconf=autoconf$suf
|
||||||
break
|
autoheader=autoheader$suf
|
||||||
fi
|
break
|
||||||
done
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
if test -z "$autoconf"; then
|
if test -z "$autoconf"; then
|
||||||
echo "ERROR: Please install autoconf 2.53"
|
echo "ERROR: Please install autoconf 2.53"
|
||||||
|
@ -94,13 +101,6 @@ $autoconf
|
||||||
$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)
|
|
||||||
|
|
||||||
echo "guile-readline..."
|
echo "guile-readline..."
|
||||||
(cd guile-readline && ./autogen.sh)
|
(cd guile-readline && ./autogen.sh)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue