small fix

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

diff --git a/autogen.sh b/autogen.sh
index 565589e..bbde5e6 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 # Run this to generate all the initial makefiles, etc.
 
 DIE=0
-package=gstreamer-plugins
+package=gst-plugins
 srcfile=gst/law/alaw.c
 
 # a quick cvs co if necessary to alleviate the pain - may remove this
@@ -26,27 +26,31 @@ 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
+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
+aclocal_check || DIE=1
 
-CONFIGURE_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-debug --enable-DEBUG'
-# if no arguments specified then this will be printed
+die_check $DIE
 
+CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-debug --enable-DEBUG'
+# if no arguments specified then this will be printed
 if test -z "$*"; then
-        echo "+ Checking for autogen.sh options"
-        echo "  This autogen script will automatically run ./configure as:"
-        echo "  ./configure $CONFIGURE_DEF_OPT"
-        echo "  To pass any additional options, please specify them on the $0"
-        echo "  command line."
+  echo "+ checking for autogen.sh options"
+  echo "  This autogen script will automatically run ./configure as:"
+  echo "  ./configure $CONFIGURE_DEF_OPT"
+  echo "  To pass any additional options, please specify them on the $0"
+  echo "  command line."
 fi
 
 toplevel_check $srcfile
 
-tool_run "aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
+tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
 
 # FIXME : why does libtoolize keep complaining about aclocal ?
 
@@ -57,8 +61,8 @@ 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"
+tool_run "$automake" "-a -c"
 
 # if enable exists, add an -enable option for each of the lines in that file
 if test -f enable; then
@@ -75,9 +79,9 @@ if test -f disable; then
 fi
 
 test -n "$NOCONFIGURE" && {
-    echo "+ skipping configure stage for package $package, as requested."
-    echo "+ autogen.sh done."
-    exit 0
+  echo "+ skipping configure stage for package $package, as requested."
+  echo "+ autogen.sh done."
+  exit 0
 }
 
 echo "+ running configure ... "
@@ -85,7 +89,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
 }