From ddd54c759aedbcabfb17335dab690ce79c5a53b4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 23 May 2011 15:02:43 -0700 Subject: [PATCH] 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 . * gnulib-tool (sed_dependencies_without_conditions): --- ChangeLog | 8 ++++++++ gnulib-tool | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86a9cb078..6ebe81628 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-05-23 Paul Eggert + + 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 + . + * gnulib-tool (sed_dependencies_without_conditions): + 2011-05-23 Bruno Haible hash: Simplify autoconf macro. diff --git a/gnulib-tool b/gnulib-tool index f6c29f27e..0bec3b3d5 100755 --- 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= -- 2.11.0