[ACS] [PATCH] egrep => grep -E

APPROVE COMMIT SUPERSEDES m23b9jglsl.fsf(a)silver.local Back in October Stephen suggested that we follow Emacs' new practice of 'grep -E' rather then egrep: http://calypso.tux.org/pipermail/xemacs-beta/2006-October/009766.html I posted a patch to do this, but for one reason or another it wasn't applied: http://calypso.tux.org/pipermail/xemacs-patches/2006-October/000010.html This is a slightly revised version of that patch. The only change is the use of $EGREP rather than 'grep -E' in aclocal.m4, so that we can rely on configure to work out if grep does what we want. This patch has been committed. Malcolm ChangeLog addition: 2007-01-01 Malcolm Purvis <malcolmp(a)xemacs.org&gt; * aclocal.m4 (XE_SHLIB_STUFF): Use 'grep -E' instead of egrep. man/ChangeLog addition: 2007-01-01 Malcolm Purvis <malcolmp(a)xemacs.org&gt; * 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 =================================================================== RCS man/ChangeLog =================================================================== RCS configure =================================================================== RCS aclocal.m4 =================================================================== RCS ChangeLog =================================================================== RCS 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 2007/01/01 08:28:45 ＠＠ -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 Index: man/internals/internals.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.77 diff -u -r1.77 internals.texi --- man/internals/internals.texi 2006/11/17 02:50:32 1.77 +++ man/internals/internals.texi 2007/01/01 08:30:23 ＠＠ -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(a)xemacs.org&gt; _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches