summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Sauer <ensonic@users.sf.net>2015-06-07 17:16:30 +0200
committerStefan Sauer <ensonic@users.sf.net>2015-06-07 17:16:30 +0200
commit54dcb3c1404595118fb3467ac982d3c1f1436f53 (patch)
treee59f676e6d402f0cc61b39041ee4e2c9eff44cc2
parent7383811278dfb635ecf38198fdded666480f2ffc (diff)
Automatic update of common submodule
From d676993 to c408583
-rwxr-xr-xautogen.sh29
m---------common0
2 files changed, 20 insertions, 9 deletions
diff --git a/autogen.sh b/autogen.sh
index 474e893e..30d4f334 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,6 @@ test -n "$srcdir" || srcdir=.
olddir=`pwd`
cd "$srcdir"
-DIE=0
package=gst-plugins-ugly
srcfile=gst-plugins-ugly.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
-Subproject d676993e50eba12f40d8e176243041d4b91f7b1
+Subproject c4085835384c8a177072dd6b38bcc3669a529b0