[gtk-doc] build: make python mandatory



commit 6490fa4af32a232ea1a6f163219c9b3fab7903b2
Author: Stefan Sauer <ensonic users sf net>
Date:   Wed Mar 22 08:24:19 2017 +0100

    build: make python mandatory
    
    Also add it to the README.

 Makefile.am  |    6 +-----
 README       |    4 +++-
 configure.ac |   10 +++-------
 3 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d71e3df..cb62d7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS = cmake help tests
 
 bin_SCRIPTS = \
        gtkdoc-check    \
+       gtkdoc-depscan
        gtkdoc-fixxref  \
        gtkdoc-mkdb     \
        gtkdoc-mkhtml   \
@@ -15,11 +16,6 @@ bin_SCRIPTS = \
        gtkdoc-scangobj \
        gtkdocize
 
-if HAVE_PYTHON
-bin_SCRIPTS += \
-       gtkdoc-depscan
-endif
-
 gtkdocdatadir = $(datadir)/gtk-doc/data
 gtkdocdata_DATA = \
        gtkdoc-common.pl        \
diff --git a/README b/README
index e5905c2..d7beedb 100644
--- a/README
+++ b/README
@@ -20,7 +20,7 @@ GTK-Doc allows your documentation to be written in 2 ways:
      the header files and parsing the declarations (deprecated now).
 
 From these source code comments and template files GTK-Doc generates a Docbook
-XML (or SGML) document, which is then transformed into HTML.
+XML document, which is then transformed into HTML and/or PDF.
 The generated HTML documentation can be browsed in an ordinary web browser or
 by using the special Devhelp API browser
 (see http://developer.imendio.com/wiki/Devhelp).
@@ -34,6 +34,8 @@ Requirements
 Perl v5 - the main scripts are in Perl.
     http://www.perl.com/
 
+Python 2.7, 3.x - the secondary scripts are written in Python
+    http:///www.python.org
 
 For XML output (recommended):
 
diff --git a/configure.ac b/configure.ac
index 7dea2f1..1f42386 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,8 +50,7 @@ fi
 dnl
 dnl Check for Python.
 dnl
-AM_PATH_PYTHON([2.3],,[:])
-AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+AM_PATH_PYTHON([2.7])
 
 dnl
 dnl Check for xsltproc
@@ -282,12 +281,9 @@ AC_MSG_NOTICE([
 gtk-doc was configured with the following options:
 ==================================================])
 
-test "$PYTHON" != : \
-    && AC_MSG_NOTICE([** Python based tools enabled, using $PYTHON]) \
-    || AC_MSG_NOTICE([   Python based tools disabled])
 test -n "$DBLATEX$FOP" \
-    && AC_MSG_NOTICE([** XML PDF support enabled, using $DBLATEX$FOP]) \
-    || AC_MSG_NOTICE([   XML PDF support disabled, no dblatex or fop available])
+    && AC_MSG_NOTICE([** PDF support enabled, using $DBLATEX$FOP]) \
+    || AC_MSG_NOTICE([   PDF support disabled, no dblatex or fop available])
 test -n "$HIGHLIGHT" \
     && AC_MSG_NOTICE([** Syntax highlighting of examples enabled, using $HIGHLIGHT]) \
     || AC_MSG_NOTICE([   Syntax highlighting of examples disabled])


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