summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2013-09-19 17:34:27 +0100
committerTim-Philipp Müller <tim@centricular.net>2013-09-19 17:34:27 +0100
commit000b1a6e046da6fec6b4b61a629330317c27adc1 (patch)
tree5a346c4508fb462bc58f878dbad35bd43820c428
parent0e6679013439352ea520c8254fa37d73d5b95124 (diff)
Automatic update of common submodule
From 12af105 to 74a6857
-rwxr-xr-xautogen.sh12
m---------common0
2 files changed, 7 insertions, 5 deletions
diff --git a/autogen.sh b/autogen.sh
index a6cd8b4c2..aab1edf35 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
-Subproject 12af105243823fc73581db4fd79a46f6d0268dc
+Subproject 74a6857d26a22d1419c89b00ba5acbc8e2a2c68