Attachment 76246 Details for Bug 62076 – Fixes build failure if valadoc is present but gtkdoc-* is missing

Fixes build failure if valadoc is present but gtkdoc-* is missing

0001-Makes-sure-that-gtkdoc-scan-is-also-checked-during-c.patch (text/plain), 1.35 KB, created by Manish Sinha on 2013-03-09 22:30:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Manish Sinha

Created: 2013-03-09 22:30:28 UTC

Size: 1.35 KB

patch

obsolete

>From feaf96a89db3b2ccfaa650e7aa08993c5b164e9e Mon Sep 17 00:00:00 2001
>From: Manish Sinha <manishsinha@ubuntu.com>
>Date: Sat, 9 Mar 2013 15:16:01 -0700
>Subject: [PATCH] Makes sure that gtkdoc-scan is also checked during configure
>
>This fixes the bug when gtk-doc-tools was not installed, hence
>gtkdoc-scan was not available. gtk doc generation is enabled by
>default and checks for only valadoc, but it ends up using
>gtkdoc-scan too somewhere in the codebase (probably for
>extracting docs from header files)
>---
> configure.ac |    9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
>diff --git a/configure.ac b/configure.ac
>index 2d8144d..2da2882 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -183,9 +183,16 @@ AS_IF([test "x$enable_docs" != "xno"], [
>     ], [
>         AS_IF([test "x$enable_docs" == "xyes"], AC_MSG_ERROR([Unable to find valadoc]))
>     ])
>+    AC_PATH_PROG(GTKDOC_SCAN, gtkdoc-scan, :)
>+    AS_IF([test -x "$GTKDOC_SCAN"], [
>+        found_gtkdoc_scan=yes
>+        AC_SUBST(GTKDOC_SCAN)
>+    ], [
>+        AS_IF([test "x$enable_docs" == "xyes"], AC_MSG_ERROR([Unable to find gtkdoc-scan]))
>+    ])
> ])
> 
>-AM_CONDITIONAL(ENABLE_DOCS, test "x$found_valadoc" = "xyes")
>+AM_CONDITIONAL(ENABLE_DOCS, test "x$found_valadoc" = "xyes" -a "x$found_gtkdoc_scan" = "xyes")
> 
> 
> AM_CONDITIONAL([HAVE_INTROSPECTION], [test "x$enable_vala" = "xyes"])
>-- 
>1.7.10.4
>

Actions: View

Attachments on bug 62076: 76246

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.