g_thread_create() is deprecated in GLib master, use g_thread_try_new() instead

[glsdk/gstreamer0-10.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 27a3ca2fa8eb9f886d6515aad03f963ba72edec3..c0cd19e54ce808d7e79f6cefd8c99aaf4caa811c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,20 +11,7 @@ then
   echo "+ Setting up common submodule"
   git submodule init
 fi
-
-# only update if the submodule is tracking master at some version,
-# which means there is no branch name
-cd common
-branch=`git branch | grep ^* | cut -c 3-`
-cd ..
-
-if test "x$branch" == "x(no branch)"
-then
-  echo "+ Updating common submodule"
-  git submodule update common
-else
-  echo "+ Not updating common submodule on branch $branch"
-fi
+git submodule update
 
 # source helper functions
 if test ! -f common/gst-autogen.sh;
@@ -48,12 +35,12 @@ CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-failing-tests --enable-pois
 
 autogen_options $@
 
-echo -n "+ check for build tools"
+printf "+ check for build tools"
 if test ! -z "$NOCHECK"; then echo ": skipped version checks"; else  echo; fi
-version_check "autoconf" "$AUTOCONF autoconf autoconf259 autoconf257 autoconf-2.54 autoconf-2.53 autoconf253 autoconf-2.52 autoconf252" \
-              "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1
-version_check "automake" "$AUTOMAKE automake automake-1.9 automake19 automake-1.8 automake18 automake-1.7 automake17 automake-1.6 automake16" \
-              "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1
+version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262 autoconf261 autoconf260" \
+              "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 60 || DIE=1
+version_check "automake" "$AUTOMAKE automake automake-1.11 automake-1.10" \
+              "ftp://ftp.gnu.org/pub/gnu/automake/" 1 10 || DIE=1
 version_check "autopoint" "autopoint" \
               "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
 version_check "libtoolize" "libtoolize libtoolize15 glibtoolize" \
@@ -63,7 +50,6 @@ version_check "pkg-config" "" \
 
 die_check $DIE
 
-autoconf_2_52d_check || DIE=1
 aclocal_check || DIE=1
 autoheader_check || DIE=1
 
@@ -95,10 +81,10 @@ patch -p0 < common/gettext.patch
 if test -f acinclude.m4; then rm acinclude.m4; fi
 
 tool_run "$libtoolize" "--copy --force"
-tool_run "$aclocal" "-I common/m4 $ACLOCAL_FLAGS"
+tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
 tool_run "$autoheader"
 
-# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo
+# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode
 echo timestamp > stamp-h.in 2> /dev/null
 
 tool_run "$autoconf"