Fix networking in the appliance.

[libguestfs.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index cbb6da8..19cca0e 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ set -v
 # Ensure that whenever we pull in a gnulib update or otherwise change to a
 # different version (i.e., when switching branches), we also rerun ./bootstrap.
 curr_status=.git-module-status
 # Ensure that whenever we pull in a gnulib update or otherwise change to a
 # different version (i.e., when switching branches), we also rerun ./bootstrap.
 curr_status=.git-module-status

-t=$(git submodule status|sed 's/.//;s/ .*//')
+t=$(git submodule status|sed 's/^[ +-]//;s/ .*//')

 if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
     : # good, it's up to date
 else
 if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
     : # good, it's up to date
 else


@@ -70,7 +70,7 @@ require_ocaml_pkg()
 
 # If no arguments were specified and configure has run before, use the previous
 # arguments
 
 # If no arguments were specified and configure has run before, use the previous
 # arguments

-if [ $# == 0 -a -x ./config.status ]; then
+if test $# == 0 && test -x ./config.status; then

     ./config.status --recheck
 else
     $CONFIGUREDIR/configure "$@"
     ./config.status --recheck
 else
     $CONFIGUREDIR/configure "$@"