Fix broken gettext setup which is not used anyway

This commit is contained in:
Tim-Philipp Müller 2013-12-22 23:04:48 +00:00
parent d2e199ed12
commit de30acfd3d
3 changed files with 7 additions and 13 deletions

View file

@ -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

2
common

@ -1 +1 @@
Subproject commit d48bed31ff6502de03a12ba226685608d3a3344e
Subproject commit f7bc1c3ab88024eb8b8e60f1af18fbcabcd83efe

View 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 ***