diff options
| author | Daniel Mack <daniel@zonque.org> | 2015-06-19 10:22:06 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2015-06-19 10:58:49 +0200 |
| commit | 06528e8fdd82b243af41b8842d71169632c4a658 (patch) | |
| tree | 5626845d5e44e904d0112032e0dbd94d8196966f | |
| parent | cf4d75ccf972a08f7a79950b7a9c7576288bf59e (diff) | |
build-sys: bring back an intltool-update workaround
Currently, 'make distcheck' fails with an error such as this:
srcdir=../../po /usr/bin/intltool-update -m
The following files contain translations and are currently not in use.
Please consider adding these to the POTFILES.in file, located in the po/ directory.
build2/src/core/org.freedesktop.systemd1.policy.in
build3/src/core/org.freedesktop.systemd1.policy.in
[...]
This is caused by a new behavior of autmake 1.15 which changed the
location of the build tree during 'make distcheck', and the fact that
intltool doesn't yet ignore that paths.
We used to have a workaround in configure.ac that makes the failing call
a no-op, but it was accidentially removed in 23756070
("remove gudev and gtk-doc").
Bring back that snipet for now, until intltool and automake sorted out
their issues and like each other again.
Also see
https://bugs.launchpad.net/intltool/+bug/1117944
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 0784966f06..8b1e275d27 100644 --- a/configure.ac +++ b/configure.ac @@ -1430,6 +1430,11 @@ AS_IF([test "x${enable_split_usr}" = "xyes"], [ ]) AM_CONDITIONAL(ENABLE_SPLIT_USR, [test "x${enable_split_usr}" = "xyes"]) +# work around intltool-update issues during 'make distcheck' +AS_IF([test "x$0" != "x./configure"], [ + AC_SUBST([INTLTOOL_UPDATE], [/bin/true]) +]) + # QEMU and OVMF UEFI firmware AS_IF([test x"$cross_compiling" = "xyes"], [], [ AC_PATH_PROG([QEMU], [qemu-system-x86_64]) |