From 14a4d3116d45306df65e9e59dfb2d13a8e4be90a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 19 Sep 2013 17:34:46 +0100 Subject: [PATCH] Automatic update of common submodule From 098c0d7 to 74a6857 --- autogen.sh | 12 +++++++----- common | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/autogen.sh b/autogen.sh index 2f346109bc..0841a4993b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -88,12 +88,14 @@ toplevel_check $srcfile # autopoint # 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 +if test -d po ; then + 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 fi -tool_run "$autopoint" "--force" "patch -p0 < common/gettext.patch" -patch -p0 < common/gettext.patch # aclocal if test -f acinclude.m4; then rm acinclude.m4; fi diff --git a/common b/common index 098c0d7432..74a6857d26 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 098c0d7432be323d631b95b5d35f6f0840bf21bd +Subproject commit 74a6857d26a22d1419c89b00ba5acbc8e2a2c68a