Changeset a1d30c5 for configure

Timestamp:

2015-05-28T04:12:23Z (9 years ago)

Author:

dequis <dx@…>

Children:

d2d2b80

Parents:

ec8b369 (diff), 3d31618 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

File:

• configure (modified) (1 diff)

configure

@@ -681 +681 @@
 
 if [ "$doc" = "1" ]; then
-        if [ ! -e doc/user-guide/help.txt ] && \
-             ! type xmlto > /dev/null 2> /dev/null || \
-             ! type xsltproc > /dev/null 2> /dev/null
-        then
+        # check this here just in case someone tries to install it in python2.4...
+        if ! python -m xml.etree.ElementTree > /dev/null 2>&1; then
                 echo
-                echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.'
-                echo 'Install xmlto and xsltproc if you want online help to work.'
-        else
-                echo "DOC=1" >> Makefile.settings
-        fi
-
-        if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
-                # skype also needs asciidoc
-                if ! type a2x > /dev/null 2> /dev/null; then
-                        echo
-                        echo 'WARNING: The skyped man page requires asciidoc. It will not be generated.'
-                else
-                        echo "ASCIIDOC=1" >> Makefile.settings
-                fi
-        fi
+                echo 'ERROR: Python (>=2.5 or 3.x) is required to generate docs'
+                exit 1
+        fi
+        echo "DOC=1" >> Makefile.settings
 fi