* lib/autoconf/general.m4 (AC_ARG_PROGRAM): Use &, not |, in

sed substitution command, so that we allow | in program prefixes
and program suffixes.  (& is a problem anyway; we're not fixing
that here.)
* lib/autoconf/status.m4 (AC_CONFIG_FILES): Likewise, for
configure_input, top_builddir, srcdir, etc.
* lib/autotest/general.m4 (AT_INIT): Likewise, for
PATH_SEPARATOR in AUTOTEST_PATH.

diff --git a/ChangeLog b/ChangeLog
index c26d3f7037e77563e22e488549385adc704d6716..194d292094a924a8cf1a246153efaeb5bcf5d8cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-07-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/autoconf/general.m4 (AC_ARG_PROGRAM): Use &, not |, in
+       sed substitution command, so that we allow | in program prefixes
+       and program suffixes.  (& is a problem anyway; we're not fixing
+       that here.)
+       * lib/autoconf/status.m4 (AC_CONFIG_FILES): Likewise, for
+       configure_input, top_builddir, srcdir, etc.
+       * lib/autotest/general.m4 (AT_INIT): Likewise, for
+       PATH_SEPARATOR in AUTOTEST_PATH.
+
 2005-07-02  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/autoconf/general.m4 (AC_SITE_LOAD): Rewrite the

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index bf4a818856cf71b2767eb13ab08ba1abb5d37df6..b44c9ebd5cf2a97acba35c0e2c921ef8e36265ec 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1501,10 +1501,10 @@ Program names:
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
 m4_divert_pop([HELP_BEGIN])dnl
 test "$program_prefix" != NONE &&
-  program_transform_name="s|^|$program_prefix|;$program_transform_name"
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
-  program_transform_name="s|\$|$program_suffix|;$program_transform_name"
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 # Double any \ or $.  echo might interpret backslashes.
 # By default was `s,x,x', remove it if useless.
 cat <<\_ACEOF >conftest.sed

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 857a95352a53cf5511a9d362e488b5447cefdf7a..ed88066b9b63ec9c69ef1e8c9ff22312b6b80a3a 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -547,13 +547,13 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 [/@[a-zA-Z_][a-zA-Z_0-9]*@/!b]
 dnl configure_input is a somewhat special, so we don't call AC_SUBST_TRACE.
-s|@configure_input@|$configure_input|;t t
+s&@configure_input@&$configure_input&;t t
 dnl During the transition period, this is a special case:
-s|@top_builddir@|$ac_top_builddir_sub|;t t[]AC_SUBST_TRACE([top_builddir])
+s&@top_builddir@&$ac_top_builddir_sub&;t t[]AC_SUBST_TRACE([top_builddir])
 m4_foreach([_AC_Var], [srcdir, abs_srcdir, top_srcdir, abs_top_srcdir,
                        builddir, abs_builddir,
                        abs_top_builddir]AC_PROVIDE_IFELSE([AC_PROG_INSTALL], [[, INSTALL]]),
-          [s|@_AC_Var@|$ac_[]_AC_Var|;t t[]AC_SUBST_TRACE(_AC_Var)
+          [s&@_AC_Var@&$ac_[]_AC_Var&;t t[]AC_SUBST_TRACE(_AC_Var)
 ])dnl
 " $ac_file_inputs m4_defn([_AC_SED_CMDS])>$tmp/out
 m4_popdef([_AC_SED_CMDS])dnl

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 4a2e49a6fc8da33963a73ac41b02547f6974c68d..49fd98ca1868eb41a70c0b34f774cc095346d9bb 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -478,7 +478,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=`echo $AUTOTEST_PATH | sed "s,:,$PATH_SEPARATOR,g"`
+AUTOTEST_PATH=`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