grep branch, master, updated. v3.3-14-g7068550

[Paul Eggert]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  706855071736294c541410eac959b167bb346ed5 (commit)
      from  3b232c7e2c408eec801c4a69eb23c42b1e22c17c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=706855071736294c541410eac959b167bb346ed5


commit 706855071736294c541410eac959b167bb346ed5
Author: Paul Eggert <address@hidden>
Date:   Sun Mar 10 11:49:33 2019 -0700

    maint: fix “/src/grep: No such file or directory”
    
    Problem reported by Jim Meyering in:
    https://lists.gnu.org/r/grep-devel/2019-02/msg00000.html
    * NEWS: Mention the change.
    * configure.ac (fn_grep): Remove.  This old attempt to fix
    <https://savannah.gnu.org/bugs/?31646> wasn’t working anyway,
    since subprograms didn’t grok fn_grep.  People building on Solaris
    will need a working grep, which is reasonably standard nowadays.
    (GREP, EGREP): Do not override.  This way, we test the
    newly-built grep only when running ‘make test’ and suchlike.
    Instead, output a hopefully-helpful diagnostic if the
    system 'grep' does not work.

diff --git a/NEWS b/NEWS
index cd43c5d..5cb33cd 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,15 @@ GNU grep NEWS                                    -*- outline 
-*-
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** Build-related
+
+  The build procedure no longer relies on any already-built src/grep
+  that might be absent or broken.  Instead, it uses the system 'grep'
+  to bootstrap, and uses src/grep only to test the build.  On Solaris
+  /usr/bin/grep is broken, but you can install GNU or XPG4 'grep' from
+  the standard Solaris distribution before building GNU Grep yourself.
+  [bug introduced in grep 2.8]
+
 
 * Noteworthy changes in release 3.3 (2018-12-20) [stable]
 
diff --git a/configure.ac b/configure.ac
index 4999840..c2268b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,45 +22,14 @@ AC_INIT([GNU grep],
         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
         address@hidden)
 
-# Set the GREP and EGREP variables to a dummy replacement for the 'grep'
-# command, so that AC_PROG_GREP and AC_PROG_EGREP don't fail when no good
-# 'grep' program is found. This makes it possible to build GNU grep on a
-# Solaris machine that has only /usr/bin/grep and no /usr/xpg4/bin/grep.
-# This function supports only restricted arguments:
-#   - No file names as arguments, process only standard input.
-#   - Only literal strings without backslashes, no regular expressions.
-#   - The only options are -e and -E (and -Ee).
-# This function also does not support long lines beyond what the shell
-# supports), and backslash-processes the input.
-fn_grep () {
-  test "$1" = -E && shift
-  case address@hidden:@:$1 in
-    0:*) AC_MSG_ERROR([fn_grep: expected pattern]) ;;
-    1:-*) AC_MSG_ERROR([fn_grep: invalid command line]) ;;
-    1:*) pattern=$1 ;;
-    2:--|2:-e|2:-Ee) pattern=$2 ;;
-    *) AC_MSG_ERROR([fn_grep: invalid command line]) ;;
-  esac
-
-  case $pattern in
-    [*['].^$\*[']*]) dnl The outer brackets are for M4.
-      AC_MSG_ERROR([fn_grep: regular expressions not supported])  ;;
-  esac
-
-  rc=1
-  while read line; do
-    case $line in
-      *$pattern*)
-        rc=0
-        AS_ECHO([$line]) ;;
-    esac
-  done
-  return $rc
-}
-
-test -n "$GREP" || GREP=fn_grep
-test -n "$EGREP" || EGREP=fn_grep
-ac_cv_path_EGREP=$EGREP
+if test -n "$GREP" || test -n "$EGREP"; then
+  AC_MSG_ERROR(
+    [no working 'grep' found
+  A working 'grep' command is needed to build GNU Grep.
+  This 'grep' should support -e and long lines.
+  On Solaris 10, install the package SUNWggrp or SUNWxcu4.
+  On Solaris 11, install the package text/gnu-grep or system/xopen/xcu4.])
+fi
 
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_SRCDIR(src/grep.c)
@@ -227,6 +196,4 @@ AC_CONFIG_FILES([
   doc/Makefile
   gnulib-tests/Makefile
 ])
-GREP="$ac_abs_top_builddir/src/grep"
-EGREP="$ac_abs_top_builddir/src/grep -E"
 AC_OUTPUT

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |  9 +++++++++
 configure.ac | 49 ++++++++-----------------------------------------
 2 files changed, 17 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
grep