Updated Catalan translation by David Planella

[~andy/gtk] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index eb87eace895b5a3db094d3e62f53fbb757fd5eb4..d3fb066d3e1933a9acd2b631452ccff48c7b8df6 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,7 +16,7 @@ have_libtool=false
 if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
        libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
        case $libtool_version in
-           1.4*|1.5*)
+           1.4*|1.5*|2.2*)
                have_libtool=true
                ;;
        esac
@@ -93,31 +93,25 @@ fi
 
 rm -rf autom4te.cache
 
+# README and INSTALL are required by automake, but may be deleted by clean
+# up rules. to get automake to work, simply touch these here, they will be
+# regenerated from their corresponding *.in files by ./configure anyway.
+touch README INSTALL
+
 $ACLOCAL $ACLOCAL_FLAGS || exit $?
 
 libtoolize --force || exit $?
 gtkdocize || exit $?
 
-echo START AUTOHEADER
 autoheader || exit $?
-echo END AUTOHEADER
 
-echo START AUTOMAKE
 $AUTOMAKE --add-missing || exit $?
-echo END AUTOMAKE
-echo START_AUTOCONF
-echo `which autoconf`
-set > /home/federico/kk
 autoconf || exit $?
-echo END_AUTOCONF
 cd $ORIGDIR || exit $?
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then
-echo START CONFIGURE
         $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
-echo END CONFIGURE
+
         echo 
         echo "Now type 'make' to compile $PROJECT."
-else
-echo CONFIGURE NOT RUN
 fi