[virt-tools-list] [PATCH virt-viewer 4/5] build-sys: simplify autogen.sh

[Daniel P. Berrange]

On Fri, Mar 30, 2012 at 03:37:44AM +0200, Marc-André Lureau wrote:
> It should support these use cases:
> - NOCONFIGURE=1 ./autogen.sh && mingw32-configure
> - ./autogen.sh CFLAGS="-ggdb3 -O0"
> ---
>  autogen.sh |   40 +++++-----------------------------------
>  1 files changed, 5 insertions(+), 35 deletions(-)
> 
> diff --git a/autogen.sh b/autogen.sh
> index cf1e33b..31cfb5a 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> @@ -1,35 +1,13 @@
>  #!/bin/sh
>  # Run this to generate all the initial makefiles, etc.
>  
> -set -e
> +set -ex
>  srcdir=`dirname $0`
>  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,16 @@ 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

I'd rather you didn't remove this.

>  
> -libtoolize --copy --force
>  intltoolize --force
> -aclocal -I m4
> -autoheader
> -automake --add-missing --copy
> -autoconf
> +autoreconf -vfi
>  
>  cd $THEDIR
>  
> -$srcdir/configure $EXTRA_ARGS "$@" && {
> +if [ -z "$NOCONFIGURE" ]; then
> +$srcdir/configure $EXTRA_ARGS ${1+"$@"} && {

What does the change in $@ vs ${1+"$@"}  actually do ?


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|