[Spice-commits] 2 commits - autogen.sh

[Marc-André Lureau]

 autogen.sh |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 0b0d52307ae20e23f21f9b2c8059d9d15f93cf51
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Mon Dec 1 13:27:53 2014 +0100

    build-sys: simplify autogen.sh

diff --git a/autogen.sh b/autogen.sh
index d92dd45..da28eef 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,8 +13,9 @@ test -z "$srcdir" && srcdir=.
     intltoolize -f
 )
 
+CONFIGURE_ARGS="--enable-maintainer-mode --enable-gtk-doc --with-gtk=3.0 --enable-vala"
 
 if [ -z "$NOCONFIGURE" ]; then
-    echo "Running configure with --enable-maintainer-mode --enable-gtk-doc --with-gtk=3.0 --enable-vala ${1+"$@"}"
-    "$srcdir"/configure --enable-maintainer-mode --enable-gtk-doc --with-gtk=3.0 --enable-vala ${1+"$@"}
+    echo "Running configure with $CONFIGURE_ARGS $@"
+    "$srcdir/configure" $CONFIGURE_ARGS "$@"
 fi
commit e0b36316cd354a23920fece44f5d0119db399980
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Mon Dec 1 13:27:34 2014 +0100

    build-sys: fix out-of-tree autofoo

diff --git a/autogen.sh b/autogen.sh
index 7b4415f..d92dd45 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,11 +5,14 @@ set -e # exit on errors
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-git submodule update --init --recursive
+(
+    cd "$srcdir"
+    git submodule update --init --recursive
+    gtkdocize
+    autoreconf -v --force --install
+    intltoolize -f
+)
 
-gtkdocize
-autoreconf -v --force --install
-intltoolize -f
 
 if [ -z "$NOCONFIGURE" ]; then
     echo "Running configure with --enable-maintainer-mode --enable-gtk-doc --with-gtk=3.0 --enable-vala ${1+"$@"}"