diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-03-30 03:06:12 +0200 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-04-01 20:09:16 +0200 |
commit | ffb17ce387dde7e5b83ada411b39da80053e27c5 (patch) | |
tree | 7d3676ef5753940383194ea04449c1588f4b1a01 | |
parent | 81c2c3bfec32f0a83abe6b938db11418d71a22db (diff) |
build-sys: simplify autogen.sh
It should support NOCONFIGURE=1 ./autogen.sh && mingw32-configure
-rwxr-xr-x | autogen.sh | 48 |
1 files changed, 11 insertions, 37 deletions
@@ -8,28 +8,6 @@ test -z "$srcdir" && srcdir=. THEDIR=`pwd` cd $srcdir -DIE=0 - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile virt-viewer." - echo "Download the appropriate package for your distribution," - echo "or see http://www.gnu.org/software/autoconf" - DIE=1 -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - DIE=1 - echo "You must have automake installed to compile virt-viewer." - echo "Download the appropriate package for your distribution," - echo "or see http://www.gnu.org/software/automake" -} - -if test "$DIE" -eq 1; then - exit 1 -fi - EXTRA_ARGS="" if test "x$1" = "x--system"; then shift @@ -41,24 +19,20 @@ if test "x$1" = "x--system"; then libdir=$prefix/lib64 fi EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir --localstatedir=$localstatedir --libdir=$libdir" - echo "Running ./configure with $EXTRA_ARGS $@" -else - if test -z "$*" ; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." - fi fi -libtoolize --copy --force intltoolize --force -aclocal -I m4 -autoheader -automake --add-missing --copy -autoconf +autoreconf -vfi cd $THEDIR -$srcdir/configure $EXTRA_ARGS "$@" && { - echo - echo "Now type 'make' to compile virt-viewer." -} +if [ -z "$NOCONFIGURE" ]; then + if test -z "$*" ; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." + fi + $srcdir/configure $EXTRA_ARGS "$@" && { + echo + echo "Now type 'make' to compile virt-viewer." + } +fi |