summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--m4/include-exclude-prog.m43
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 61ee8c3b9..e9e2892e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-11-05 Jim Meyering <meyering@redhat.com>
+ Don't use GNU-sed-specific \< \> operators here, either.
+ * m4/include-exclude-prog.m4 (gl_REMOVE_PROG): Use a loop, as below.
+
Use tighter regexps when performing name substitution.
* man/Makefile.am (mapped_name): Add ^ and $$ anchors.
diff --git a/m4/include-exclude-prog.m4 b/m4/include-exclude-prog.m4
index e5612c69f..d0addc776 100644
--- a/m4/include-exclude-prog.m4
+++ b/m4/include-exclude-prog.m4
@@ -19,7 +19,8 @@ AC_DEFUN([gl_ADD_PROG],
# Usage: gl_REMOVE_PROG([prog_list_var_name], [prog_name])
AC_DEFUN([gl_REMOVE_PROG],
[{
- $1=`echo "$$1"|sed 's/\<'"$2"'\>//;s/ */ /g;s/^ *//;s/ *$//'`
+ $1=`for gl_rem_i in $$1; do
+ test "$gl_rem_i" = "$2" || echo "$gl_rem_i" done | tr '\012' ' '; echo`
}])
# Given the name of a variable containing a space-separated list of