bootstrap: port to FreeBSD

* build-aux/bootstrap (bootstrap_sync): Port sh -c usage to shells
that treat '--' differently.  Reported by Mats Erik Andersson in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-03/msg00012.html>.

diff --git a/ChangeLog b/ChangeLog
index 59da1f8..537ae93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+       bootstrap: port to FreeBSD
+       * build-aux/bootstrap (bootstrap_sync): Port sh -c usage to shells
+       that treat '--' differently.  Reported by Mats Erik Andersson in
+       <http://lists.gnu.org/archive/html/bug-gnulib/2013-03/msg00012.html>.
+
 2013-03-08  Gary V. Vaughan  <gary@gnu.org>
 
        regex: rename remaining __attribute calls to __attribute__.

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index bee7765..96f1e76 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2013-01-20.16; # UTC
+scriptversion=2013-03-08.16; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -630,9 +630,13 @@ esac
 if $bootstrap_sync; then
   cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
     echo "$0: updating bootstrap and restarting..."
+    case $(sh -c 'echo "$1"' -- a) in
+      a) ignored=--;;
+      *) ignored=ignored;;
+    esac
     exec sh -c \
       'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
-      -- "$GNULIB_SRCDIR/build-aux/bootstrap" \
+      $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
       "$0" "$@" --no-bootstrap-sync
   }
 fi