* configure.ac (AC_PROG_GREP): Add.

* lib/freeze.mk (GREP): New macro.

diff --git a/ChangeLog b/ChangeLog
index 563bb0954cf771337eff311b7e492c7b9c83b203..69b21c497415030acd704fe1dd82c489410cdf65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
        Solaris.
        * tests/local.at (AC_STATE_SAVE): Use $GREP, not grep.
        Define it with AC_PROG_GREP.
+       * configure.ac (AC_PROG_GREP): Add.
+       * lib/freeze.mk (GREP): New macro.
 
 2004-05-02  Eric Sunshine <sunshine@sunshineco.com>
 

diff --git a/configure.ac b/configure.ac
index ff8b7763dec0260f633290cff0e2cf65192c3e73..bd5b9a159f4c0ca2d5a1812e835b21a214eeda2a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 #                                                       -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-#
+# Copyright (C) 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
+# 2004 Free Software Foundation, Inc.
+
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
@@ -163,6 +163,12 @@ AC_SUBST([EMACS], [$TEST_EMACS])
 AM_PATH_LISPDIR
 
 
+## ------ ##
+## Grep.  ##
+## ------ ##
+AC_PROG_GREP
+
+
 ## ------------ ##
 ## Conclusion.  ##
 ## ------------ ##

diff --git a/lib/freeze.mk b/lib/freeze.mk
index f40c60992e471102413c7b85657c0a0294ee5e1a..4522d0f142ff2d3076a8dda0129b10afb11eed97 100644 (file)
--- a/lib/freeze.mk
+++ b/lib/freeze.mk
@@ -1,6 +1,6 @@
 ## Freeze M4 files.
 
-## Copyright (C) 2002 Free Software Foundation, Inc.
+## Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -113,13 +113,20 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
 
+## ---------- ##
+## Run GREP.  ##
+## ---------- ##
+
+GREP = @GREP@
+
+
 ## -------------------------------- ##
 ## Looking for forbidden patterns.  ##
 ## -------------------------------- ##
 
 check-forbidden-patterns:
        if (cd $(srcdir) && \
-           grep $(forbidden_patterns) $(forbidden_patterns_files)) \
+           $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \
            >forbidden.log; then \
          echo "ERROR: forbidden patterns were found:" >&2; \
          sed "s,^,$*.m4: ," <forbidden.log >&2; \