Whenever possible, use the vertical bar as sed delimiter.

* lib/autoconf/functions.m4 (GETLOADAVG_LIBS) [AC_FUNC_GETLOADAVG]:
Use "|", not "!".
* lib/autoconf/status.m4 (_AC_SRCDIRS) [ac_top_builddir_sub]:
[ac_dir_suffix]: Use "|", not "," as sed delimiter.
* tests/mktests.sh (as_me): Likewise.
* lib/freeze.mk (check-forbidden-patterns): Likewise.
* lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): Likewise.
* configure: Regenerate.
* doc/autoconf.texi (Shell Substitutions): Use "|", not "," in examples.
* lib/autotest/general.m4 (AT_INIT): Use "|", not "&" as sed delimiter
in the : -> $PATH_SEPARATOR transformation of $AUTOTEST_PATH.  This is fine,
as long as $PATH_SEPARATOR doesn't contain "|".

diff --git a/ChangeLog b/ChangeLog
index 11500cc35ed75d67e221559ee3aa38e1f8155e9e..235d1f0661db15189bba4f8fe365951b7eae6081 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-09-24  Jim Meyering  <jim@meyering.net>
+
+       Whenever possible, use the vertical bar as sed delimiter.
+       * lib/autoconf/functions.m4 (GETLOADAVG_LIBS) [AC_FUNC_GETLOADAVG]:
+       Use "|", not "!".
+       * lib/autoconf/status.m4 (_AC_SRCDIRS) [ac_top_builddir_sub]:
+       [ac_dir_suffix]: Use "|", not "," as sed delimiter.
+       * tests/mktests.sh (as_me): Likewise.
+       * lib/freeze.mk (check-forbidden-patterns): Likewise.
+       * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): Likewise.
+       * configure: Regenerate.
+       * doc/autoconf.texi (Shell Substitutions): Use "|", not "," in examples.
+       * lib/autotest/general.m4 (AT_INIT): Use "|", not "&" as sed delimiter
+       in the : -> $PATH_SEPARATOR transformation of $AUTOTEST_PATH.
+       This is fine, as long as $PATH_SEPARATOR doesn't contain "|".
+
 2007-09-22  Jim Meyering  <jim@meyering.net>
 
        Add a comment.

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 59da298d6568411020974833e98ec0c5a8d68f81..e2fc67e08b6e8b300f89897ac6e61b23abcdaafc 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -528,7 +528,7 @@ check-forbidden-patterns:
            $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \
            >forbidden.log; then \
          echo "ERROR: forbidden patterns were found:" >&2; \
-         sed "s,^,$*.m4: ," <forbidden.log >&2; \
+         sed "s|^|$*.m4: |" <forbidden.log >&2; \
          echo >&2; \
          exit 1; \
        else \

diff --git a/configure b/configure
index b7ebea5b96f84bf0cef13567e4faeb3ebe97e170..a6f20ace9a55671868a6f9084888a3d4fff8fec5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1339,9 +1339,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -3808,9 +3808,9 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index a2af90cce688a8150551e6c9905a177d7c6a04da..f05b10967ac8527e4510195a030ed8a16ffc37a4 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -11794,7 +11794,7 @@ For instance, the following code:
 
 @example
 case "$given_srcdir" in
-.)  top_srcdir="`echo "$dots" | sed 's,/$,,'`" ;;
+.)  top_srcdir="`echo "$dots" | sed 's|/$||'`" ;;
 *)  top_srcdir="$dots$given_srcdir" ;;
 esac
 @end example
@@ -11804,7 +11804,7 @@ is more readable when written as:
 
 @example
 case $given_srcdir in
-.)  top_srcdir=`echo "$dots" | sed 's,/$,,'` ;;
+.)  top_srcdir=`echo "$dots" | sed 's|/$||'` ;;
 *)  top_srcdir=$dots$given_srcdir ;;
 esac
 @end example

diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in
index 03feef5dbcab71e5277f898cd5805a4bcd090920..f035605330558a61f3893fc1e77e97d9dec6f8bf 100644 (file)
--- a/lib/autoconf/Makefile.in
+++ b/lib/autoconf/Makefile.in
@@ -530,7 +530,7 @@ check-forbidden-patterns:
            $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \
            >forbidden.log; then \
          echo "ERROR: forbidden patterns were found:" >&2; \
-         sed "s,^,$*.m4: ," <forbidden.log >&2; \
+         sed "s|^|$*.m4: |" <forbidden.log >&2; \
          echo >&2; \
          exit 1; \
        else \

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index a5d34d7c5454151fcabca5940a1f8589d03e6147..0907e40b0eaac2a2525556925220e48944189bdf 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -560,7 +560,7 @@ rm -f conftest*
 # Here, we change these into -L/foo -L/bar -L/baz (and put it first):
 ac_[]_AC_LANG_ABBREV[]_v_output="`echo $ac_[]_AC_LANG_ABBREV[]_v_output |
        grep 'LPATH is:' |
-       sed 's,.*LPATH is\(: *[[^ ]]*\).*,\1,;s,: */, -L/,g'` $ac_[]_AC_LANG_ABBREV[]_v_output"
+       sed 's|.*LPATH is\(: *[[^ ]]*\).*|\1|;s|: */| -L/|g'` $ac_[]_AC_LANG_ABBREV[]_v_output"
 
 # FIXME: we keep getting bitten by quoted arguments; a more general fix
 #        that detects unbalanced quotes in FLIBS should be implemented

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index e1598c811d399fca8abc9cc33999285afffcfe1e..a992325945d4e789658237905855a3c372ac0d0f 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -775,7 +775,7 @@ fi
 if test "x$ac_save_LIBS" = x; then
   GETLOADAVG_LIBS=$LIBS
 else
-  GETLOADAVG_LIBS=`AS_ECHO(["$LIBS"]) | sed "s!$ac_save_LIBS!!"`
+  GETLOADAVG_LIBS=`AS_ECHO(["$LIBS"]) | sed "s|$ac_save_LIBS||"`
 fi
 LIBS=$ac_save_LIBS
 

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index c07e6d7a42666ded9d601eb16879b333d8a31d44..5b43e1160c01aafcca9c0d01ea10b51b860500db 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -105,9 +105,9 @@ m4_define([_AC_SRCDIRS],
 case $1 in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`AS_ECHO([$1]) | sed 's,^\.[[\\/]],,'`
+  ac_dir_suffix=/`AS_ECHO([$1]) | sed 's|^\.[[\\/]]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`AS_ECHO(["$ac_dir_suffix"]) | sed 's,/[[^\\/]]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`AS_ECHO(["$ac_dir_suffix"]) | sed 's|/[[^\\/]]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;

diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in
index 4d63bb6f92daf046c28111b762fd150a9597c4d4..34de00956d87ddd59bbadc9be8819ffdcc4a3e07 100644 (file)
--- a/lib/autoscan/Makefile.in
+++ b/lib/autoscan/Makefile.in
@@ -447,7 +447,7 @@ check-forbidden-patterns:
            $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \
            >forbidden.log; then \
          echo "ERROR: forbidden patterns were found:" >&2; \
-         sed "s,^,$*.m4: ," <forbidden.log >&2; \
+         sed "s|^|$*.m4: |" <forbidden.log >&2; \
          echo >&2; \
          exit 1; \
        else \

diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in
index fa1c0a2e694b620923a939dc50c82cd1d7fc721f..48f5b2e66def0bd14a4fb5a33e3e4908e0c188aa 100644 (file)
--- a/lib/autotest/Makefile.in
+++ b/lib/autotest/Makefile.in
@@ -524,7 +524,7 @@ check-forbidden-patterns:
            $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \
            >forbidden.log; then \
          echo "ERROR: forbidden patterns were found:" >&2; \
-         sed "s,^,$*.m4: ," <forbidden.log >&2; \
+         sed "s|^|$*.m4: |" <forbidden.log >&2; \
          echo >&2; \
          exit 1; \
        else \

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index f562679fe3c6b337ad8c4eb4f426197724dd0a58..f2a6f38e32391734654b5550f6da5a936a5af32b 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -559,7 +559,7 @@ m4_divert_push([PREPARE_TESTS])dnl
 # For embedded test suites, AUTOTEST_PATH is relative to the top level
 # of the package.  Then expand it into build/src parts, since users
 # may create executables in both places.
-AUTOTEST_PATH=`AS_ECHO(["$AUTOTEST_PATH"]) | sed "s&:&$PATH_SEPARATOR&g"`
+AUTOTEST_PATH=`AS_ECHO(["$AUTOTEST_PATH"]) | sed "s|:|$PATH_SEPARATOR|g"`
 at_path=
 _AS_PATH_WALK([$AUTOTEST_PATH $PATH],
 [test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR

diff --git a/lib/freeze.mk b/lib/freeze.mk
index 28cf5548f9e083dbd67e07d455ab8f6b2ec7f524..7f40bad600f9323c0b7468ca1e594a8324a91c46 100644 (file)
--- a/lib/freeze.mk
+++ b/lib/freeze.mk
@@ -122,7 +122,7 @@ check-forbidden-patterns:
            $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \
            >forbidden.log; then \
          echo "ERROR: forbidden patterns were found:" >&2; \
-         sed "s,^,$*.m4: ," <forbidden.log >&2; \
+         sed "s|^|$*.m4: |" <forbidden.log >&2; \
          echo >&2; \
          exit 1; \
        else \

diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index e691e724dc25efa7aa7f827942765e75c67f2b3e..b0b8b8d33ea5911b1e6b2209dd042eac2774cb7d 100644 (file)
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -538,7 +538,7 @@ check-forbidden-patterns:
            $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \
            >forbidden.log; then \
          echo "ERROR: forbidden patterns were found:" >&2; \
-         sed "s,^,$*.m4: ," <forbidden.log >&2; \
+         sed "s|^|$*.m4: |" <forbidden.log >&2; \
          echo >&2; \
          exit 1; \
        else \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index db59ebc77ada02d1d81007bff83d06ef329f8345..f2aa3bfbe996ea9664c23f0a66848a550c553dbc 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -488,7 +488,7 @@ check-forbidden-patterns:
            $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \
            >forbidden.log; then \
          echo "ERROR: forbidden patterns were found:" >&2; \
-         sed "s,^,$*.m4: ," <forbidden.log >&2; \
+         sed "s|^|$*.m4: |" <forbidden.log >&2; \
          echo >&2; \
          exit 1; \
        else \

diff --git a/tests/mktests.sh b/tests/mktests.sh
index a7145e99e2ad2cbf53e8cc783217f968a2d585ac..68631b04ec583ee1ad40bbf750e9eba7f1d64549 100755 (executable)
--- a/tests/mktests.sh
+++ b/tests/mktests.sh
@@ -23,7 +23,7 @@
 # If we fail, clean up, but touch the output files.  We probably failed
 # because we used some non-portable tool.
 
-as_me=`echo "$0" | sed 's,.*[\\/],,'`
+as_me=`echo "$0" | sed 's|.*[\\/]||'`
 
 trap 'echo "'"$as_me"': failed." >&2
       rm -f acdefuns audefuns requires *.tat
@@ -181,7 +181,7 @@ au_exclude_script="$exclude_list $au_exclude_list {print}"
 
 for file in $src
 do
-  base=`echo "$file" | sed 's,.*[\\/],,;s/\..*//'`
+  base=`echo "$file" | sed 's|.*[\\/]||;s|\..*||'`
   # Get the list of macros which are defined in Autoconf level.
   # Get rid of the macros we are not interested in.
   sed -n -e 's/^AC_DEFUN(\[*\([a-zA-Z0-9_]*\).*$/\1/p' \