From 31510e28836f7c70bde546f7059f98d1e901de36 Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Sun, 7 Jun 2015 17:16:19 +0200 Subject: [PATCH] Automatic update of common submodule From d676993 to c408583 --- autogen.sh | 29 ++++++++++++++++++++--------- common | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/autogen.sh b/autogen.sh index 01d3fda..f7c047f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -13,7 +13,6 @@ test -n "$srcdir" || srcdir=. olddir=`pwd` cd "$srcdir" -DIE=0 package=gst-plugins-good srcfile=gst-plugins-good.doap @@ -56,13 +55,25 @@ fi autogen_options $@ printf "+ check for build tools" -if test ! -z "$NOCHECK"; then echo ": skipped version checks"; else echo; fi -version_check "autoreconf" "autoreconf " \ - "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 68 || DIE=1 -version_check "pkg-config" "" \ - "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 - -die_check $DIE +if test -z "$NOCHECK"; then + echo + + printf " checking for autoreconf ... " + echo + which "autoreconf" 2>/dev/null || { + echo "not found! Please install the autoconf package." + exit 1 + } + + printf " checking for pkg-config ... " + echo + which "pkg-config" 2>/dev/null || { + echo "not found! Please install pkg-config." + exit 1 + } +else + echo ": skipped version checks" +fi # if no arguments specified then this will be printed if test -z "$*" && test -z "$NOCONFIGURE"; then @@ -76,7 +87,7 @@ fi toplevel_check $srcfile # autopoint -if test -d po ; then +if test -d po && grep ^AM_GNU_GETTEXT_VERSION configure.ac >/dev/null ; then tool_run "autopoint" "--force" fi diff --git a/common b/common index d676993..c408583 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit d676993e50eba12f40d8e176243041d4b91f7b13 +Subproject commit c4085835384c8a177072dd6b38bcc3669a529b0a -- 2.7.4