From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 7 Feb 2013 02:11:27 +0000 (-0500)
Subject: build-sys: disable tests in po/, docs/ with separate build dir
X-Git-Tag: v198~276
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=6fc00209d5906bd14d54af4a6ac2961dd9731f72

build-sys: disable tests in po/, docs/ with separate build dir

Both gtk-doc and intltoolize have problems with VPATH builds.
"Creatively" disable tests when configuring from outside the
source directory.

This more-or-less reverts 9795da43c.
---

diff --git a/configure.ac b/configure.ac
index 56694ff22..4e36dc3dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -821,6 +821,13 @@ AS_IF([test "x${enable_split_usr}" = "xyes"], [
         AC_DEFINE(HAVE_SPLIT_USR, 1, [Define if /bin, /sbin aren't symlinks into /usr])
 ])
 
+# Work around intltoolize and gtk-doc problems in VPATH builds
+AM_CONDITIONAL([ENABLE_GTK_DOC_TESTS], [test "x$0" = "x./configure"],
+                                       [Define to do gtk-doc tests])
+AS_IF([test "x$0" != "x./configure"], [
+        AC_SUBST([INTLTOOL_UPDATE], [/bin/true])
+])
+
 AC_SUBST([dbuspolicydir], [$with_dbuspolicydir])
 AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir])
 AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
diff --git a/docs/gudev/Makefile.am b/docs/gudev/Makefile.am
index 3a3a3e5d7..64e436102 100644
--- a/docs/gudev/Makefile.am
+++ b/docs/gudev/Makefile.am
@@ -108,6 +108,8 @@ EXTRA_DIST += version.xml.in
 
 # Comment this out if you want your docs-status tested during 'make check'
 if ENABLE_GTK_DOC
-#TESTS_ENVIRONMENT = cd $(top_srcdir)
-#TESTS = $(GTKDOC_CHECK)
+if ENABLE_GTK_DOC_TESTS
+TESTS_ENVIRONMENT = cd $(top_srcdir)
+TESTS = $(GTKDOC_CHECK)
+endif
 endif
diff --git a/docs/libudev/Makefile.am b/docs/libudev/Makefile.am
index d96bac6b3..cc236ad50 100644
--- a/docs/libudev/Makefile.am
+++ b/docs/libudev/Makefile.am
@@ -102,6 +102,8 @@ EXTRA_DIST += version.xml.in
 
 # Comment this out if you want your docs-status tested during 'make check'
 if ENABLE_GTK_DOC
-#TESTS_ENVIRONMENT = cd $(top_srcdir)
-#TESTS = $(GTKDOC_CHECK)
+if ENABLE_GTK_DOC_TESTS
+TESTS_ENVIRONMENT = cd $(top_srcdir)
+TESTS = $(GTKDOC_CHECK)
+endif
 endif