summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-02-06 21:11:27 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-02-13 01:05:28 -0500
commit6fc00209d5906bd14d54af4a6ac2961dd9731f72 (patch)
tree40427d4a8cce4ccf9083699a88ac0e99be19779d
parent6bb25a058227d89fbbeba6c12873e6f83da5cf94 (diff)
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.
-rw-r--r--configure.ac7
-rw-r--r--docs/gudev/Makefile.am6
-rw-r--r--docs/libudev/Makefile.am6
3 files changed, 15 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 56694ff22a..4e36dc3dca 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 3a3a3e5d72..64e4361021 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 d96bac6b30..cc236ad50a 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