FYI: 6-gary-remove-conditional-AC_PROG_EGREP-replacement.patch

[Gary V. Vaughan]

Applied to HEAD.
--
  ())_.  Gary V. Vaughan    gary@(oranda.demon.co.uk|gnu.org)
  ( '/   Research Scientist http://www.oranda.demon.co.uk       ,_())____
  / )=   GNU Hacker         http://www.gnu.org/software/libtool  \'      `&
`(_~)_   Tech' Author       http://sources.redhat.com/autobook   =`---d__/

Index: ChangeLog
from  Alexandre Duret-Lutz  <address@hidden>

        * 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.

Index: bootstrap
===================================================================
RCS file: /cvsroot/libtool/libtool/bootstrap,v
retrieving revision 1.26
diff -u -p -u -r1.26 bootstrap
--- bootstrap 31 Jul 2003 20:41:34 -0000 1.26
+++ bootstrap 29 Aug 2003 14:06:49 -0000
@@ -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"
Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libtool.m4,v
retrieving revision 1.333
diff -u -p -u -r1.333 libtool.m4
--- libtool.m4 27 Aug 2003 16:24:44 -0000 1.333
+++ libtool.m4 29 Aug 2003 14:06:49 -0000
@@ -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