From f777de7d7f33b4982bdf39db59b4680482bcea3a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Sun, 26 Apr 2015 15:00:05 +0100
Subject: [PATCH] autogen.sh: only run autopoint if gettext requested in
 configure.ac

Not just because there happens to be a po directory.

https://bugzilla.gnome.org/show_bug.cgi?id=748058
---
 autogen.sh | 29 ++++++++++++++++++++---------
 common     |  2 +-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 5d0da72..265d4f5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,6 @@ test -n "$srcdir" || srcdir=.
 olddir=`pwd`
 cd "$srcdir"
 
-DIE=0
 package=gst-rtsp-server
 srcfile=gst-rtsp-server.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 c8fb372..44a3517 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit c8fb372b4c58158d6cb4e309650eb7bc369f882c
+Subproject commit 44a351788c83205f179b26af04f0eeaafb3b0d95
-- 
2.7.4