[gnome-photos] build: Workaround intltool-update not working with automake-1.15
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] build: Workaround intltool-update not working with automake-1.15
- Date: Tue, 27 Oct 2015 11:05:53 +0000 (UTC)
commit b7571c2709770656f9e80b1cfc5bb847f66e47e7
Author: Debarshi Ray <debarshir gnome org>
Date: Tue Oct 27 11:57:02 2015 +0100
build: Workaround intltool-update not working with automake-1.15
This is caused by automake-1.15 changing the location of the build tree
during distcheck, and the fact that intltool doesn't ignore the path,
yet.
Original patch from Zbigniew Jędrzejewski-Szmek for systemd.
https://bugs.launchpad.net/intltool/+bug/1117944
configure.ac | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d558281..438c89d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,11 @@ fi
AX_REQUIRE_DEFINED([YELP_HELP_INIT])
YELP_HELP_INIT
+# work around intltool-update issues during 'make distcheck'
+AS_IF([test "x$0" != "x./configure"], [
+ AC_SUBST([INTLTOOL_UPDATE], [/bin/true])
+])
+
AC_CONFIG_FILES([
Makefile
data/Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]