added changelog

[platform/upstream/gstreamer.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 2252f3d..3f14a99 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,14 +25,18 @@ fi
 autogen_options $@
 
 echo -n "+ check for build tools"
-if test ! -z $NOCHECK; then echo " skipped"; else  echo; fi
-version_check "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1
-version_check "automake" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1
-version_check "libtool" "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1
-version_check "pkg-config" "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
+if test ! -z $NOCHECK; then echo ": skipped version checks"; else  echo; fi
+version_check "autoconf" "$AUTOCONF" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1
+version_check "automake" "$AUTOMAKE" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1
+version_check "libtool" "" "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1
+version_check "pkg-config" "" "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
+
+die_check $DIE
 
 autoconf_2.52d_check || DIE=1
 
+die_check $DIE
+
 CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir'
 # if no arguments specified then this will be printed
 if test -z "$*"; then
@@ -45,6 +49,7 @@ fi
 
 toplevel_check $srcfile
 
+if test -e acinclude.m4; then rm acinclude.m4; fi
 tool_run "aclocal" "-I common/m4 $ACLOCAL_FLAGS"
 
 # FIXME : why does libtoolize keep complaining about aclocal ?
@@ -56,14 +61,15 @@ tool_run "autoheader"
 # touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo
 echo timestamp > stamp-h.in 2> /dev/null
 
-tool_run "autoconf"
-tool_run "automake" "-a -c"
+tool_run "$autoconf"
+debug "automake: $automake"
+tool_run "$automake" "-a -c"
 
 echo
 echo "+ running autogen.sh in libs/ext/cothreads..."
 pushd libs/ext/cothreads > /dev/null
 echo
-./autogen.sh --autogen-noconfigure --autogen-nocheck || {
+./autogen.sh --noconfigure --nocheck || {
         echo "autogen in cothreads failed."
         exit 1
 }
@@ -81,7 +87,7 @@ test ! -z "$CONFIGURE_DEF_OPT" && echo "  ./configure default flags: $CONFIGURE_
 test ! -z "$CONFIGURE_EXT_OPT" && echo "  ./configure external flags: $CONFIGURE_EXT_OPT"
 echo
 
-./configure $CONFIGURE_OPT $CONFIGURE_EXT_OPT || {
+./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT || {
         echo "  configure failed"
         exit 1
 }