summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2013-12-22 23:04:48 +0000
committerTim-Philipp Müller <tim@centricular.com>2013-12-22 23:10:56 +0000
commitde30acfd3d9655d3819348d53d3977c8e69ac5d3 (patch)
tree45b4a912ea25741f0482b3426032d0f086b0d540
parentd2e199ed121903ae741e2fbb67e1ee04dce77bf2 (diff)
Fix broken gettext setup which is not used anyway
-rwxr-xr-xautogen.sh12
m---------common0
-rw-r--r--configure.ac6
3 files changed, 6 insertions, 12 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
-Subproject d48bed31ff6502de03a12ba226685608d3a3344
+Subproject f7bc1c3ab88024eb8b8e60f1af18fbcabcd83ef
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 ***