From: Stefan Zimmermann <stzi@linux.vnet.ibm.com>
Date: Fri, 6 Feb 2015 16:19:03 +0000 (+0100)
Subject: maint: improve usage of autogen's --no-git
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0c77a54e3b23c7c14932c0c224c32c15f4cbad41;p=libvirt.git

maint: improve usage of autogen's --no-git

If you build libvirt with the --no-git option, then gnulib requires
either $GNULIB_SRCDIR in the environment or --gnulib-srcdir on the
command line.  But we had not been supporting its use from the
command line.  This patch is a bit picky: --gnulib-srcdir must be
passed immediately after --no-git; but since we don't reorder
arguments, and since we already required --no-git to be first to
have any effect, it's not too horrible.  It also does the wrong
thing if you include spaces in your arguments, but developers
doing that deserve what they get, right?

Signed-off-by: Stefan Zimmermann <stzi@linux.vnet.ibm.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/autogen.sh b/autogen.sh
index 1965f64689..d1c319d39c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,6 +20,10 @@ no_git=
 if test "x$1" = "x--no-git"; then
   no_git=" $1"
   shift
+  case "$1 $2" in
+    --gnulib-srcdir=*) no_git="$no_git $1"; shift ;;
+    --gnulib-srcdir\ *) no_git="$no_git $1=$2"; shift; shift;;
+  esac
 fi
 if test -z "$NOCONFIGURE" ; then
   if test "x$1" = "x--system"; then