# HG changeset patch
# User malcolmp
# Date 1167645853 0
# Node ID 5f25b1501bcd14858b1187940d822822e8ce9f06
# Parent  30958064156d181b4a12913391a2311ae1b996fc
[xemacs-hg @ 2007-01-01 10:03:52 by malcolmp]
Use 'grep -E' rather than egrep and 'grep -F' rather than fgrep.

diff -r 30958064156d -r 5f25b1501bcd ChangeLog
--- a/ChangeLog	Mon Jan 01 07:46:38 2007 +0000
+++ b/ChangeLog	Mon Jan 01 10:04:13 2007 +0000
@@ -1,3 +1,7 @@
+2007-01-01  Malcolm Purvis  <malcolmp@xemacs.org>
+
+	* aclocal.m4 (XE_SHLIB_STUFF): Use $EGREP instead of egrep.
+
 2006-12-28  Malcolm Purvis  <malcolmp@xemacs.org>
 
 	* configure.ac: Ensure ac_configure_args contains a leading space
diff -r 30958064156d -r 5f25b1501bcd aclocal.m4
--- a/aclocal.m4	Mon Jan 01 07:46:38 2007 +0000
+++ b/aclocal.m4	Mon Jan 01 10:04:13 2007 +0000
@@ -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 | $EGREP '(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 | $EGREP '(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 | $EGREP ': supported targets:.* elf' > /dev/null; then
       dll_ld=$CC
       dll_ldflags="-shared"
       ld_shlibs=yes
diff -r 30958064156d -r 5f25b1501bcd configure
--- a/configure	Mon Jan 01 07:46:38 2007 +0000
+++ b/configure	Mon Jan 01 10:04:13 2007 +0000
@@ -21488,7 +21488,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 | $EGREP '(GNU|with BFD)' > /dev/null; then
           xe_gnu_ld=yes
         else
           xe_gnu_ld=no
@@ -21520,7 +21520,7 @@
 echo "$as_me:$LINENO: checking if the linker is GNU ld" >&5
 echo $ECHO_N "checking if the linker is GNU ld... $ECHO_C" >&6
 # 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 | $EGREP '(GNU|with BFD)' 1>&5; then
   xe_gnu_ld=yes
 else
   xe_gnu_ld=no
@@ -21561,7 +21561,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 | $EGREP ': supported targets:.* elf' > /dev/null; then
       dll_ld=$CC
       dll_ldflags="-shared"
       ld_shlibs=yes
diff -r 30958064156d -r 5f25b1501bcd man/ChangeLog
--- a/man/ChangeLog	Mon Jan 01 07:46:38 2007 +0000
+++ b/man/ChangeLog	Mon Jan 01 10:04:13 2007 +0000
@@ -1,3 +1,8 @@
+2007-01-01  Malcolm Purvis  <malcolmp@xemacs.org>
+
+	* internals/internals.texi (Ben's README): Use 'grep -F' instead
+	of fgrep.
+
 2006-11-07  Robert Pluim  <rpluim@gmail.com>
 
 	* lispref/os.texi (User Identification): The code uses HOMEPATH,
diff -r 30958064156d -r 5f25b1501bcd man/internals/internals.texi
--- a/man/internals/internals.texi	Mon Jan 01 07:46:38 2007 +0000
+++ b/man/internals/internals.texi	Mon Jan 01 10:04:13 2007 +0000
@@ -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