X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=autogen.sh;h=55842b14e66d0746e211d6e77bbc97f06863b9ad;hb=b0c050c7de5b8f834ee9c8328bef843ed385749d;hp=3f97995f56f5c863bb02e0a093af74be0efd2472;hpb=002cdf48fee7a59d13865ea9848671b588e86daf;p=libguestfs.git

diff --git a/autogen.sh b/autogen.sh
index 3f97995..55842b1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,11 +20,53 @@
 
 set -e
 set -v
-export AUTOMAKE='automake --foreign'
-aclocal
-libtoolize
-autoreconf -i
-pushd daemon
-autoreconf -i
-popd
-./configure "$@"
+
+# 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)
+if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
+    : # good, it's up to date
+else
+    echo running bootstrap...
+    ./bootstrap && echo "$t" > $curr_status
+fi
+
+CONFIGUREDIR=.
+
+# Run configure in BUILDDIR if it's set
+if [ ! -z "$BUILDDIR" ]; then
+    mkdir -p $BUILDDIR
+    cd $BUILDDIR
+
+    CONFIGUREDIR=..
+fi
+
+# Ensure that an ocaml package is present for build-from sources.
+# This is *not* for anything that is required at configure-time
+# when configure is run from a distribution tarball.  From those,
+# nothing ocaml-related is required.
+require_ocaml_pkg()
+{
+  pkg=$1
+  test -d .git || return 1
+  url=$(git config remote.origin.url) || return 1
+  case $url in
+    *et.redhat.com/*) ;;
+    *) return 1;;
+  esac
+  ocamlfind query $pkg || return 1
+  test -f "$(ocamlfind query $pkg)/xml-light.cmxa" || return 1
+  return 0
+}
+
+require_ocaml_pkg xml-light \
+  || { echo "you must have ocaml, ocamlfind, ocaml-xml-light and ocaml-xml-light-devel"; exit 1; }
+
+# If no arguments were specified and configure has run before, use the previous
+# arguments
+if [ $# == 0 -a -x ./config.status ]; then
+    ./config.status --recheck
+else
+    $CONFIGUREDIR/configure "$@"
+fi