From de30acfd3d9655d3819348d53d3977c8e69ac5d3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Sun, 22 Dec 2013 23:04:48 +0000
Subject: [PATCH] Fix broken gettext setup which is not used anyway

---
 autogen.sh   | 12 +++---------
 common       |  2 +-
 configure.ac |  6 +++---
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 7bde014..239fa5b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -72,15 +72,9 @@ fi
 toplevel_check $srcfile
 
 # autopoint
-#    older autopoint (< 0.12) has a tendency to complain about mkinstalldirs
-if test -x mkinstalldirs; then rm mkinstalldirs; fi
-#    first remove patch if necessary, then run autopoint, then reapply
-if test -f po/Makefile.in.in;
-then
-  patch -p0 -R --forward < common/gettext.patch
-fi
-tool_run "$autopoint" "--force" "patch -p0 < common/gettext.patch"
-patch -p0 < common/gettext.patch
+#if test -d po ; then
+#  tool_run "$autopoint" "--force"
+#fi
 
 # aclocal
 # if test -f acinclude.m4; then rm acinclude.m4; fi
diff --git a/common b/common
index d48bed3..f7bc1c3 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit d48bed31ff6502de03a12ba226685608d3a3344e
+Subproject commit f7bc1c3ab88024eb8b8e60f1af18fbcabcd83efe
diff --git a/configure.ac b/configure.ac
index d662ace..2cee9be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,9 +57,9 @@ AC_CONFIG_MACRO_DIR([m4])
 
 dnl set up gettext
 dnl the version check needs to stay here because autopoint greps for it
-AM_GNU_GETTEXT_VERSION([0.17])
-AM_GNU_GETTEXT([external])
-AG_GST_GETTEXT([gstreamer-$GST_API_VERSION])
+#AM_GNU_GETTEXT_VERSION([0.17])
+#AM_GNU_GETTEXT([external])
+#AG_GST_GETTEXT([gst-rtsp-server-$GST_API_VERSION])
 
 dnl *** check for arguments to configure ***
 
-- 
2.7.4