mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

(mscripts): find and check version number of

Browse source 
automake. Complain if 1.6 is not found.
This commit is contained in:
Han-Wen Nienhuys 2002-07-22 00:17:26 +00:00
parent bcbd25b74f
commit afc8e572ba
3 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2002-07-22 Han-Wen <hanwen@cs.uu.nl>
* autogen.sh (mscripts): find and check version number of
automake. Complain if 1.6 is not found.
2002-07-20 Han-Wen <hanwen@cs.uu.nl> 2002-07-20 Han-Wen <hanwen@cs.uu.nl>
* autogen.sh (mscripts): find and check version number of * autogen.sh (mscripts): find and check version number of

24
autogen.sh
View file

@ -100,6 +100,24 @@ if test -z "$autoconf"; then
echo "ERROR: Please install autoconf 2.53" echo "ERROR: Please install autoconf 2.53"
exit 1 exit 1
fi 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
################################################################ ################################################################
@ -110,15 +128,15 @@ $autoconf
# file. We need two mdate-sh, tho, one in doc/ref/ and one in # file. We need two mdate-sh, tho, one in doc/ref/ and one in
# doc/tutorial/. We run automake twice as a workaround. # 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. # Make sure that libltdl uses the same autoconf version as the rest.
# #
echo "libltdl..." echo "libltdl..."
(cd libltdl && aclocal) (cd libltdl && aclocal)
(cd libltdl && autoconf) (cd libltdl && autoconf)
(cd libltdl && automake --gnu --add-missing) (cd libltdl && $automake --gnu --add-missing)
echo "guile-readline..." echo "guile-readline..."
(cd guile-readline && ./autogen.sh) (cd guile-readline && ./autogen.sh)

2
libguile/goops.c
View file

@ -1872,7 +1872,7 @@ scm_compute_applicable_methods (SCM gf, SCM args, long len, int find_method_p)
return SCM_BOOL_F; return SCM_BOOL_F;
} }
scm_remember_upto_here (tmp); scm_remember_upto_here_1 (tmp);
return (count == 1 return (count == 1
? applicable ? applicable
: sort_applicable_methods (applicable, count, types)); : sort_applicable_methods (applicable, count, types));