diff options
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/autogen.sh | 55 |
1 files changed, 35 insertions, 20 deletions
diff --git a/misc/autogen.sh b/misc/autogen.sh index debfc19f6..ff840a3a6 100755 --- a/misc/autogen.sh +++ b/misc/autogen.sh @@ -4,6 +4,7 @@ # Raph Levien, slightly hacked for xine by Daniel Caujolle-Bert. DIE=0 +automake_1_6x=$1 PROG=xine-lib @@ -30,19 +31,21 @@ esac DIE=1 } +if test x"$automake_1_6x" != "xyes"; then (automake --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have automake installed to compile $PROG." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz" + echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.6.tar.gz" echo "(or a newer version if it is available)" DIE=1 } +fi (aclocal --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: Missing aclocal. The version of automake" echo "installed doesn't appear recent enough." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz" + echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.6.tar.gz" echo "(or a newer version if it is available)" DIE=1 } @@ -51,31 +54,43 @@ if [ "$DIE" -eq 1 ]; then exit 1 fi -aclocalinclude="$ACLOCAL_FLAGS"; \ -(echo $_echo_n " + Running aclocal: $_echo_c"; \ - aclocal $aclocalinclude -I m4; \ - echo "done.") && \ -(echo $_echo_n " + Running libtoolize: $_echo_c"; \ - libtoolize --force --copy >/dev/null 2>&1; \ - echo "done.") && \ -(echo $_echo_n " + Running autoheader: $_echo_c"; \ - autoheader; \ - echo "done.") && \ -(echo $_echo_n " + Running automake: $_echo_c"; \ - automake --gnu --add-missing --copy; \ - echo "done.") && \ -(echo $_echo_n " + Running autoconf: $_echo_c"; \ - autoconf; \ - echo "done.") +aclocalinclude="$ACLOCAL_FLAGS"; +echo $_echo_n " + Running aclocal: $_echo_c"; + aclocal $aclocalinclude -I m4; +echo "done." + +echo $_echo_n " + Running libtoolize: $_echo_c"; + libtoolize --force --copy >/dev/null 2>&1; +echo "done." + +echo $_echo_n " + Running autoheader: $_echo_c"; + autoheader; +echo "done." + +echo $_echo_n " + Running automake: $_echo_c"; + +if test x"$automake_1_6x" = "xyes"; then + automake-1.6 --gnu --add-missing --copy; +else + automake --gnu --add-missing --copy; +fi +echo "done." + +echo $_echo_n " + Running autoconf: $_echo_c"; + autoconf; +echo "done." rm -f config.cache +#configure_flags=`expr $@ | sed -e 's/yes//'` +#echo "$configure_flags" +configure_flags=$2 if [ x"$NO_CONFIGURE" = "x" ]; then - echo " + Running 'configure $@':" + echo " + Running 'configure $configure_flags':" if [ -z "$*" ]; then echo " ** If you wish to pass arguments to ./configure, please" echo " ** specify them on the command line." fi - ./configure "$@" && \ + ./configure "$configure_flags" && \ echo "Now type 'make' to compile $PKG_NAME" || exit 1 fi |