[ostree] build: Fix the build without documentation



commit 9c79b352a1b0e8e031606e36c6299adb0eda46cf
Author: Colin Walters <walters verbum org>
Date:   Fri Aug 16 23:14:30 2013 -0400

    build: Fix the build without documentation
    
    Just key everything of gtk-doc.

 Makefile-ostree.am |    2 --
 Makefile.am        |    2 +-
 configure.ac       |   12 +-----------
 3 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index 58aa676..56ca4f5 100644
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -89,5 +89,3 @@ ostree_SOURCES += \
 ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
 ostree_LDADD += $(OT_INTERNAL_SOUP_LIBS)
 endif
-
-MANPAGES += doc/ostree.1
diff --git a/Makefile.am b/Makefile.am
index 67fb6b9..bcd28e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ endif
 
 SUBDIRS += .
 
-if BUILD_DOCUMENTATION
+if ENABLE_GTK_DOC
 SUBDIRS += doc
 endif
 
diff --git a/configure.ac b/configure.ac
index 23f2cc1..5492351 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,18 +83,8 @@ AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test x$found_introspection = xyes)
 
 LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0"
 
-AC_ARG_ENABLE(documentation,
-              AC_HELP_STRING([--enable-documentation],
-                             [build documentation]),,
-              enable_documentation=yes)
-AS_IF([test x$enable_documentation = xyes], [
-   AC_PATH_PROG([XSLTPROC], [xsltproc])
-   AS_IF([test x$XSLTPROC = x], [
-      AC_MSG_ERROR([xsltproc is required to build documentation])
-   ])
 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
-])
-AM_CONDITIONAL(BUILD_DOCUMENTATION, test x$enable_documentation = xyes)
+AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 AC_ARG_WITH(libarchive,
            AS_HELP_STRING([--without-libarchive], [Do not use libarchive]),


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