6-gary-AC_PROG_FGREP-match-expression.patch

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Okay to commit?
- --
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
__________________________________________________________
This patch notification generated by cvsapply version 0.13
http://savannah.gnu.org/projects/cvs-utils
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFAhWDhFRMICSmD1gYRApmwAKCZwhMJdPErOT72iCjE6AC9Abq0KACfbrb9
n6Rao59fBZuFSM5wWi2dNXc=
=geGR
-----END PGP SIGNATURE-----

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>

        * lib/autoconf/programs.m4 (_AC_PROG_GREP): Take an additional
        match expression argument, as different greps have different
        regular expression flavours.
        (AC_PROG_FGREP): Pass 'FGREP'. fgrep treats all match chars as
        literals.
        (AC_PROG_EGREP): Pass 'EGREP$'.
        (AC_PROG_GREP): Pass 'GREP$'.

Index: lib/autoconf/programs.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/programs.m4,v
retrieving revision 1.23
diff -u -p -u -r1.23 programs.m4
--- lib/autoconf/programs.m4 20 Apr 2004 16:54:35 -0000 1.23
+++ lib/autoconf/programs.m4 20 Apr 2004 17:43:20 -0000
@@ -366,7 +366,7 @@ AC_CACHE_CHECK([for egrep], ac_cv_path_E
    [if echo a | ($GREP -E '(a|b)') >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     _AC_PROG_GREP(EGREP, egrep)
+     _AC_PROG_GREP(EGREP, egrep, [EGREP$])
    fi])
  EGREP="$ac_cv_path_EGREP"
  AC_SUBST([EGREP])
@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for fgrep], ac_cv_path_F
    [if echo 'ab*c' | ($GREP -F 'ab*c') >/dev/null 2>&1
    then ac_cv_path_FGREP="$GREP -F"
    else
-     _AC_PROG_GREP(FGREP, fgrep)
+     _AC_PROG_GREP(FGREP, fgrep, FGREP)
    fi])
  FGREP="$ac_cv_path_FGREP"
  AC_SUBST([FGREP])
@@ -394,14 +394,15 @@ AC_CACHE_CHECK([for fgrep], ac_cv_path_F
 # the longest lines possible.  Prefer GNU grep if found.
 AC_DEFUN([AC_PROG_GREP],
 [AC_CACHE_CHECK([for grep that handles long lines], ac_cv_path_GREP,
-   [_$0(GREP, [grep ggrep])])
+   [_$0(GREP, [grep ggrep], [GREP$])])
  GREP="$ac_cv_path_GREP"
  AC_SUBST([GREP])
 ])
+# _AC_PROG_GREP(VARIABLE, PROGNAME-LIST, MATCH-EXPRESSION)
 m4_define([_AC_PROG_GREP],
 [_AC_PATH_PROG_FEATURE_CHECK([$1], [$2],
        [_AC_FEATURE_CHECK_LENGTH([ac_path_$1], [ac_cv_path_$1],
-               ["$ac_path_$1" '$1$'], [$1])])
+               ["$ac_path_$1" '$3'], [$1])])
 ])