[libgda] Gracefuly handle the absence of yelp-build
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Gracefuly handle the absence of yelp-build
- Date: Thu, 5 Apr 2012 19:51:29 +0000 (UTC)
commit 9474142b46869cf9edbceb9674f795184f7b521c
Author: Vivien Malerba <malerba gnome-db org>
Date: Thu Apr 5 18:57:50 2012 +0200
Gracefuly handle the absence of yelp-build
configure.ac | 9 +++++----
doc/Makefile.am | 6 +++++-
2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 220bc8d..3d2495f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -607,13 +607,14 @@ enable_vala_doc="no"
if test "x$enable_gtk_doc" = "xyes"
then
dnl Find yelp-build program
- AC_PATH_PROG(YELP_BUILD, [yelp-build], [no])
+ AC_PATH_PROG(YELP_BUILD, [yelp-build], [no])
if test "x$YELP_BUILD" = "xno";
then
- AC_MSG_ERROR([Vala documentation requested but yelp-build not found])
+ AC_MSG_RESULT([Vala documentation not build because yelp-build has not been found])
+ else
+ AC_SUBST(YELP_BUILD)
+ enable_vala_doc="yes"
fi
- AC_SUBST(YELP_BUILD)
- enable_vala_doc="yes"
fi
AM_CONDITIONAL(ENABLE_VALA_DOC, [test "$enable_vala_doc" = "yes"])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 421c599..2d3c84e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,7 @@
-SUBDIRS = C mallard
+if ENABLE_VALA_DOC
+MALLARD_DOC_DIR=mallard
+endif
+
+SUBDIRS = C $(MALLARD_DOC_DIR)
DOC_LINGUAS = el es gl
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]