Changeset beb0f54

Timestamp:

2015-05-17T04:13:30Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

965127b

Parents:

baa09cc

Message:

configure: Replace xmlto/xsltproc checks with a python>=2.5 check

It actually checks that xml.etree.ElementTree can be imported, which is
good enough.

The script works fine in 2.5 (tested with centos 6), and doesn't work
in 2.4 but we don't support centos 5 anymore so no problem there.

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
+                echo 'ERROR: Python (>=2.5 or 3.x) is required to generate docs'
+                exit 1
+        fi
+        echo "DOC=1" >> Makefile.settings
 
         if [ "$skype" = "1" -o "$skype" = "plugin" ]; then