path: root/
diff options
authorAlexey Neyman <>2017-02-13 02:53:23 (GMT)
committerAlexey Neyman <>2017-02-14 06:47:40 (GMT)
commit7bcf18bfab84374d3305c7a088f95ac1219ddf93 (patch)
tree49c67ed5fb9729ef554c3a07a916612af5139e24 /
parentfbc69323085e2370faeb8b46291cd66cbf9ef649 (diff)
Determine whether -E/-r option selects extended regexp
... and then use the right option. See the note in scripts/functions on where we should use ${foo} and where just 'foo'; this boils down to whether we can expect the build tools override to be in effect (e.g. in the actual build scripts) or not (i.e. outside of scripts/build). While running in scripts/functions, or in scripts/ the build tools override directory (.build/tools/bin) may have not been set up (yet, or at all). Also, modify the installed scripts (populate, xldd) accordingly. Signed-off-by: Alexey Neyman <>
Diffstat (limited to '')
1 files changed, 21 insertions, 9 deletions
diff --git a/ b/
index 11c5a8e..439cdca 100644
--- a/
+++ b/
@@ -171,15 +171,27 @@ AS_IF([test "$EGREP" != "$GREP -E"],
AC_ARG_VAR([INSTALL], [Specify the full path to GNU sed])
-AC_MSG_CHECKING([whether sed understands -r -i -e])
-echo foo > .ct-ng.sed.test
-${SED} -r -i -e 's/f(o)o/b\1ar/' .ct-ng.sed.test >/dev/null 2>&1
-content=`cat .ct-ng.sed.test`
-rm -f .ct-ng.sed.test
-AS_IF([test "$rc:$content" = "0:boar"],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_ERROR([sed does not accept -r -i -e])])
+AC_CACHE_CHECK([whether $SED understands -i -e],
+ [acx_cv_sed_i_e],
+ [echo foo > .ct-ng.sed.test
+ ${SED} -i -e 's/foo/bar/' .ct-ng.sed.test >/dev/null 2>&1
+ rc=$?
+ content=`cat .ct-ng.sed.test`
+ rm -f .ct-ng.sed.test
+ AS_IF([test "$rc:$content" = "0:bar"],
+ [acx_cv_sed_i_e=yes],
+ [AC_MSG_ERROR([sed does not accept -i -e])])])
+AC_CACHE_CHECK([which $SED option selects extended regexp],
+ [acx_cv_sed_r],
+ [opt_r=`echo foo | $SED -r -e 's/f(o)o/b\1ar/' 2>/dev/null`
+ opt_E=`echo foo | $SED -E -e 's/f(o)o/b\1ar/' 2>/dev/null`
+ AS_IF([test "$opt_r" = "boar"],
+ [acx_cv_sed_r=-r],
+ [test "$opt_E" = "boar"],
+ [acx_cv_sed_r=-E],
+ [AC_MSG_ERROR([neither -r nor -E enables extended regexp])])])
+SED_R="$SED $acx_cv_sed_r"