Fix broken gettext setup which is not used anyway
authorTim-Philipp Müller <tim@centricular.com>
Sun, 22 Dec 2013 23:04:48 +0000 (23:04 +0000)
committerTim-Philipp Müller <tim@centricular.com>
Sun, 22 Dec 2013 23:10:56 +0000 (23:10 +0000)
autogen.sh
common
configure.ac

index 7bde014..239fa5b 100755 (executable)
@@ -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 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit d48bed31ff6502de03a12ba226685608d3a3344e
+Subproject commit f7bc1c3ab88024eb8b8e60f1af18fbcabcd83efe
index d662ace..2cee9be 100644 (file)
@@ -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 ***