autogen.sh: verbose param

autogen.sh

@@ -6,31 +6,35 @@ test -z "$srcdir" && srcdir=.
 cd $srcdir
 
 PROJECT=gFTP
-test -f lib/gftp.h || {
+if ! test -f lib/gftp.h  ; then
 	echo "You must run this script in the top-level $PROJECT directory"
 	exit 1
-}
+fi
 
 test -z "$AUTOMAKE"   && AUTOMAKE=automake
 test -z "$ACLOCAL"    && ACLOCAL=aclocal
 test -z "$AUTOCONF"   && AUTOCONF=autoconf
 test -z "$AUTOHEADER" && AUTOHEADER=autoheader
 
-set -x 
+if test "$1" == "verbose" || test "$1" == "--verbose" ; then
+	set -x
+	verbose='--verbose'
+	verbose2='--debug'
+fi
 
 #Get all required m4 macros required for configure
-libtoolize --copy --force || exit 1
-$ACLOCAL -I m4 || exit 1
+libtoolize ${verbose} --copy --force || exit 1
+$ACLOCAL ${verbose} -I m4 || exit 1
 
 #Generate config.h.in
-$AUTOHEADER --force || exit 1
+$AUTOHEADER ${verbose} --force || exit 1
 
 #Generate Makefile.in's
 touch config.rpath
-$AUTOMAKE --add-missing --copy --force || exit 1
+$AUTOMAKE ${verbose} --add-missing --copy --force || exit 1
 
-if grep "IT_PROG_INTLTOOL" configure.ac ; then
-	intltoolize -c --automake --force || exit 1
+if grep "IT_PROG_INTLTOOL" configure.ac >/dev/null ; then
+	intltoolize ${verbose2} -c --automake --force || exit 1
 	# po/Makefile.in.in has these lines:
 	#    mostlyclean:
 	#       rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
@@ -40,5 +44,6 @@ if grep "IT_PROG_INTLTOOL" configure.ac ; then
 fi
 
 #generate configure
-$AUTOCONF --force || exit 1
+$AUTOCONF ${verbose} --force || exit 1
 
+rm -rf autom4te.cache