[PATCH] docs/Makefile.am: use `WITH_DOCS_TRUE` to fix `--with-docs=no`



Date: Sun, 8 May 2011 12:26:06 +0200

Although passing `--with-docs=no` to `configure` the build system still tries to include `gtk-doc.make`.

        […]
        callouts/Makefile.am: installing `./depcomp'
        automake: cannot open < gtk-doc.make: No such file or directory
        autoreconf: automake failed with exit status: 1

This comes from

        $ more docs/libnm-util/Makefile.am
        […]
        # include common portion ...
        include $(top_srcdir)/gtk-doc.make
        […]

which is parsed from the following Makefile.

        $ more docs/Makefile.am
        if WITH_DOCS

        SUBDIRS = api libnm-glib libnm-util

        endif

Searching for this variable does not return any results.

        $ grep 'WITH_DOCS' angstrom-dev/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.3.999-r0/git/config*
        angstrom-dev/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.3.999-r0/git/configure:WITH_DOCS_FALSE
        angstrom-dev/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.3.999-r0/git/configure:WITH_DOCS_TRUE
        angstrom-dev/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.3.999-r0/git/configure:  WITH_DOCS_TRUE=
        angstrom-dev/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.3.999-r0/git/configure:  WITH_DOCS_FALSE='#'
        angstrom-dev/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.3.999-r0/git/configure:  WITH_DOCS_TRUE='#'
        angstrom-dev/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.3.999-r0/git/configure:  WITH_DOCS_FALSE=
        angstrom-dev/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.3.999-r0/git/configure:if test -z "${WITH_DOCS_TRUE}" && test -z "${WITH_DOCS_FALSE}"; then
        angstrom-dev/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.3.999-r0/git/configure:  as_fn_error "conditional \"WITH_DOCS\" was never defined.
        angstrom-dev/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.3.999-r0/git/configure.ac:AM_CONDITIONAL(WITH_DOCS, test "x$with_docs" = "xyes")
---
This patch is not build tested.
---
 docs/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index a1d1b9b..786140f 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,4 +1,4 @@
-if WITH_DOCS
+if WITH_DOCS_TRUE
 
 SUBDIRS = api libnm-glib libnm-util
 
-- 
1.7.4.4

Attachment: signature.asc
Description: This is a digitally signed message part



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]