From e8bf40b90324f174e25518a3a841f83467d6abd8 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 29 Aug 2003 14:09:50 +0000 Subject: [PATCH] * libtool.m4 (_LT_AC_LANG_C_CONFIG): Fix unquoted call to _LT_AC_LANG_C_CONFIG. (AC_PROG_EGREP): Remove, now that Libtool requires Autoconf 2.56. * bootstrap: Issue an upgrade warning. --- ChangeLog | 7 +++++++ bootstrap | 17 ++++++++++++++--- libtool.m4 | 17 +---------------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index e29d30448..97e38127e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-08-29 Alexandre Duret-Lutz + + * libtool.m4 (_LT_AC_LANG_C_CONFIG): Fix unquoted call to + _LT_AC_LANG_C_CONFIG. + (AC_PROG_EGREP): Remove, now that Libtool requires Autoconf 2.56. + * bootstrap: Issue an upgrade warning. + 2003-08-27 Gary V. Vaughan * libtool.m4 (_LT_AC_CHECK_DLFCN): Use the interrim new diff --git a/bootstrap b/bootstrap index 304284fc0..5f0cf58dd 100755 --- a/bootstrap +++ b/bootstrap @@ -1,15 +1,26 @@ #! /bin/sh # helps bootstrapping libtool, when checked out from CVS -# requires at least GNU autoconf 2.50 and GNU automake1.4-p5 +# requires at least GNU autoconf 2.56 and GNU automake 1.7 -find . \( -name autom4te.cache -o -name libtool \) -exec rm -r {} \; +rm -rf `find . \( -name autom4te.cache -o -name libtool \) -print` : ${ACLOCAL=aclocal} : ${AUTOMAKE=automake} : ${AUTOCONF=autoconf} : ${AUTOHEADER=autoheader} +# Upgrade caveat + +cat <<'EOF' +WARNING: If bootstrapping with this script fails, it may be due to an +WARNING: incompatible installed `libtool.m4' being pulled in to +WARNING: `aclocal.m4'. The best way to work around such a problem is to +WARNING: uninstall pour system libtool files, or failing that, overwrite +WARNING: them with `libtool.m4' as shipped with this distribution. +WARNING: After that, retry this bootstrap. +EOF + # fake the libtool scripts touch ltmain.sh touch libtoolize @@ -17,7 +28,7 @@ touch libtoolize for sub in . libltdl cdemo demo depdemo mdemo mdemo2 pdemo tagdemo f77demo; do case $sub in - .) + .) top_srcdir=. acfiles="$top_srcdir/libtool.m4" AUTOMAKE_FLAGS="--gnu --add-missing --copy" diff --git a/libtool.m4 b/libtool.m4 index cff37f304..f029e1570 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1856,21 +1856,6 @@ pic_mode=ifelse($#,1,$1,default) ])# AC_LIBTOOL_PICMODE -# AC_PROG_EGREP -# ------------- -# This is predefined starting with Autoconf 2.54, so this conditional -# definition can be removed once we require Autoconf 2.54 or later. -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) -])]) - - # AC_PATH_TOOL_PREFIX # ------------------- # find a file program which can recognise shared library @@ -2504,7 +2489,7 @@ if test "$GCC" = no; then fi if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : + if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : else AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no -- 2.47.2