From 489970e047a78f7806747b99a7e1bd170fc5c75b Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 12 Dec 2012 04:07:22 +0000 Subject: pkg-infra: pass --disable-doc if documentation is not enabled Many configure scripts support an option like --disable-doc, --disable-docs or --disable-documentation. Pass all of these to configure. In addition, not all Xorg packages accept the --disable-xxx. Instead they look for xmlto and/or fop and build documentation if they exist. For host packages, this may lead to build errors because /usr/bin/xmlto uses libxml2 and we set LD_LIBRARY_PATH to point to $(HOST_DIR)/lib, which may contain a libxml2 as well. So it's essential to disable xmlto for host packages. Also some whitespace cleanup. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/Makefile.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'package/Makefile.in') diff --git a/package/Makefile.in b/package/Makefile.in index 4281773a3..cc8f3202c 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -290,7 +290,15 @@ DISABLE_LARGEFILE= --disable-largefile endif ifneq ($(BR2_HAVE_DOCUMENTATION),y) -DISABLE_DOCUMENTATION=--disable-gtk-doc +# The configure option varies, but since unknown options are ignored +# we can pass all of them. +DISABLE_DOCUMENTATION = \ + --disable-gtk-doc \ + --disable-doc \ + --disable-docs \ + --disable-documentation \ + --with-xmlto=no \ + --with-fop=no endif ifeq ($(BR2_INET_IPV6),y) -- cgit v1.2.3