picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-02-06 21:11:27 -05:00
parent 6bb25a0582
commit 6fc00209d5
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -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])

6
docs/gudev/Makefile.am
View file

@ -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

6
docs/libudev/Makefile.am
View file

@ -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