diff --git a/autogen.sh b/autogen.sh index 2240566a3..29edb6cb6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,67 +6,10 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. cd "$srcdir" -DIE=0 - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $package." - echo "Download the appropriate package for your system," - echo "or get the source from one of the GNU ftp sites" - echo "listed in http://www.gnu.org/order/ftp.html" - DIE=1 -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have automake installed to compile $package." - echo "Download the appropriate package for your system," - echo "or get the source from one of the GNU ftp sites" - echo "listed in http://www.gnu.org/order/ftp.html" - DIE=1 -} - -(libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have libtool installed to compile $package." - echo "Download the appropriate package for your system," - echo "or get the source from one of the GNU ftp sites" - echo "listed in http://www.gnu.org/order/ftp.html" - DIE=1 -} - -#(gettext --version) < /dev/null > /dev/null 2>&1 || { -# echo -# echo "You must have gettext installed to compile $package." -# echo "Download the appropriate package for your system," -# echo "or get the source from one of the GNU ftp sites" -# echo "listed in http://www.gnu.org/order/ftp.html" -# DIE=1 -#} - -if test "$DIE" -eq 1; then - exit 1 -fi - -if [ ! -e acinclude.m4 ]; then - for i in .. ../.. ../../..; do - if [ -e `pwd`/$i/acinclude.m4 ]; then - ln -s `pwd`/$i/acinclude.m4 . - fi - done -fi - echo "Generating configuration files for $package, please wait...." -echo " aclocal $ACLOCAL_FLAGS" -aclocal $ACLOCAL_FLAGS -echo " libtoolize --automake" -libtoolize --automake -#echo " gettextize" -#gettextize -echo " autoconf" -autoconf -echo " autoheader" -autoheader -echo " automake --add-missing" -automake --add-missing +aclocal --force +libtoolize --force +autoconf --force +autoheader --force +automake --add-missing --force-missing --foreign