[PATCH] egrep => grep -E

[Malcolm Purvis]

Picking up on Stephen's suggestion in -beta, this changes all the occurrences
of egrep and fgrep in 21.5.

Malcolm


ChangeLog addition:

2006-10-20  Malcolm Purvis  <malcolmp at xemacs.org>

	* aclocal.m4 (XE_SHLIB_STUFF): Use 'grep -E' instead of egrep.


man/ChangeLog addition:

2006-10-20  Malcolm Purvis  <malcolmp at xemacs.org>

	* internals/internals.texi (Ben's README): Use 'grep -F' instead
	of fgrep.


xemacs-egrep source patch:
Diff command:   cvs -q diff -u
Files affected: man/internals/internals.texi aclocal.m4

Index: aclocal.m4
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/aclocal.m4,v
retrieving revision 1.13
diff -u -r1.13 aclocal.m4
--- aclocal.m4	2006/03/28 15:55:49	1.13
+++ aclocal.m4	2006/10/20 13:21:06
@@ -355,7 +355,7 @@
         # Check to see if the program is GNU ld.  I'd rather use --version,
         # but apparently some GNU ld's only accept -v.
         # Break only if it was the GNU/non-GNU ld that we prefer.
-        if "$LTLD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+        if "$LTLD" -v 2>&1 < /dev/null | grep -E '(GNU|with BFD)' > /dev/null; then
           xe_gnu_ld=yes
         else
           xe_gnu_ld=no
@@ -385,7 +385,7 @@
 # Check to see if it really is or isn't GNU ld.
 AC_MSG_CHECKING([if the linker is GNU ld])
 # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+if $LTLD -v 2>&1 </dev/null | grep -E '(GNU|with BFD)' 1>&5; then
   xe_gnu_ld=yes
 else
   xe_gnu_ld=no
@@ -425,7 +425,7 @@
   can_build_shared=yes
   if test "$xe_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
     # See if GNU ld supports shared libraries.
-    if $LTLD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+    if $LTLD --help 2>&1 | grep -E ': supported targets:.* elf' > /dev/null; then
       dll_ld=$CC
       dll_ldflags="-shared"
       ld_shlibs=yes
Index: man/internals/internals.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v
retrieving revision 1.76
diff -u -r1.76 internals.texi
--- man/internals/internals.texi	2006/07/07 23:01:06	1.76
+++ man/internals/internals.texi	2006/10/20 13:21:58
@@ -16610,7 +16610,7 @@
 the function names.) Use something like
 
 @example
-fgrep -f ../nmkun.txt -w [a-hj-z]*.[ch]  |m
+grep -F -f ../nmkun.txt -w [a-hj-z]*.[ch]  |m
 @end example
 
 in the source directory, which does a word match and skips

-- 
		     Malcolm Purvis <malcolmp at xemacs.org>