gnulib-tool: fix portability problem with MacOS sed

A sed command like "/x/{s/a/b/}" is not portable; a newline is needed
before the "}".  Problem reported by Leo in
<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00717.html>.
* gnulib-tool (sed_dependencies_without_conditions):
(cherry picked from commit ddd54c759aedbcabfb17335dab690ce79c5a53b4)

diff --git a/ChangeLog b/ChangeLog
index 026dca0..bfa3a71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+       gnulib-tool: fix portability problem with MacOS sed
+       A sed command like "/x/{s/a/b/}" is not portable; a newline is needed
+       before the "}".  Problem reported by Leo in
+       <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00717.html>.
+       * gnulib-tool (sed_dependencies_without_conditions):
+
 2011-05-23  Bruno Haible  <bruno@clisp.org>
 
        getugroups: Fix module description.

diff --git a/gnulib-tool b/gnulib-tool
index f6c29f2..0bec3b3 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2694,8 +2694,12 @@ func_modules_transitive_closure ()
               func_append inmodules " $dep"
               if test -n "$cond_dependencies"; then
                 escaped_dep=`echo "$dep" | sed -e "$sed_escape_dependency"`
-                sed_extract_condition1='/^ *'"$escaped_dep"' *$/{s/^.*$/true/p}'
-                sed_extract_condition2='/^ *'"$escaped_dep"' *\[.*\] *$/{s/^ *'"$escaped_dep"' *\[\(.*\)\] *$/\1/p}'
+                sed_extract_condition1='/^ *'"$escaped_dep"' *$/{
+                  s/^.*$/true/p
+                }'
+                sed_extract_condition2='/^ *'"$escaped_dep"' *\[.*\] *$/{
+                  s/^ *'"$escaped_dep"' *\[\(.*\)\] *$/\1/p
+                }'
                 condition=`func_get_dependencies $module | sed -n -e "$sed_extract_condition1" -e "$sed_extract_condition2"`
                 if test "$condition" = true; then
                   condition=