From: Bruno Haible <bruno@clisp.org>
Date: Sun, 11 Mar 2007 22:16:19 +0000 (+0000)
Subject: Avoid using sed -e "", not supported by AIX sed.
X-Git-Tag: cvs-readonly~799
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=b0f35f9decd75d92e2310b4271b898545b28a533;p=gnulib.git

Avoid using sed -e "", not supported by AIX sed.
Add optional CONFIGURE_OPTIONS variable.
---

diff --git a/gnulib-tool b/gnulib-tool
index 36b4aad78..d23e3d97b 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-03-11 22:11:22 $'
+cvsdatestamp='$Date: 2007-03-11 22:16:19 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -2821,9 +2821,9 @@ func_create_megatestdir ()
    echo "   : autobuild revision... cvs-\$CVSDATE-000000"
    echo "   : autobuild timestamp... \`date \"+%Y%m%d-%H%M%S\"\`"
    echo "   : autobuild hostname... \`hostname\`"
-   echo "   cd \$module && ./configure && make && make check"
+   echo "   cd \$module && ./configure \$CONFIGURE_OPTIONS && make && make check"
    echo "   echo rc=\$?"
-   echo "  ) 2>&1 | sed -e \"\$AUTOBUILD_SUBST\" > logs/\$safemodule"
+   echo "  ) 2>&1 | { if test -n \"\$AUTOBUILD_SUBST\"; then sed -e \"\$AUTOBUILD_SUBST\"; else cat; fi; } > logs/\$safemodule"
    echo "done"
   ) > "$megatestdir/autobuild"
   chmod a+x "$megatestdir/autobuild"