Ticket #29434: patch-autogen.sh.diff

File patch-autogen.sh.diff, 1.1 KB (added by tael67@…, 14 years ago)
  • .sh

    old new  
    1818        DIE=1
    1919}
    2020
    21 if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
     21if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
     22    AUTOMAKE=automake-1.11
     23    ACLOCAL=aclocal-1.11
     24elif automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
    2225    AUTOMAKE=automake-1.10
    2326    ACLOCAL=aclocal-1.10
    2427elif automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then
     
    3841        DIE=1
    3942fi
    4043
    41 (libtool --version) < /dev/null > /dev/null 2>&1 || {
     44(glibtool --version) < /dev/null > /dev/null 2>&1 || {
    4245        echo
    4346        echo "You must have libtool installed to compile $PROJECT."
    4447        echo "Get http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz"
     
    4952        exit 1
    5053fi
    5154
    52 libtoolize --force --copy
     55glibtoolize --force --copy --quiet
    5356
    5457$ACLOCAL $ACLOCAL_FLAGS
    5558autoheader
    56 $AUTOMAKE --add-missing
     59$AUTOMAKE --add-missing < /dev/null > /dev/null 2>&1
    5760autoconf
    5861cd $THEDIR
    5962
    6063$srcdir/configure --enable-maintainer-mode "$@"
    61 
    62 echo
    63 echo "Now type 'make' to compile $PROJECT"