diff options
| author | dequis <dx@dxzone.com.ar> | 2015-05-17 01:13:30 -0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2015-05-17 01:13:30 -0300 |
| commit | beb0f549e68ce3a4fb0b42cda1868b35b6e16f9b (patch) | |
| tree | 9bf5b10a8dcf90a4c82052dba8893f740554dd06 | |
| parent | baa09ccba7c014338f24176129ee1d07ebb8502e (diff) | |
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.
| -rwxr-xr-x | configure | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -680,16 +680,13 @@ if [ "$skype" = "1" -o "$skype" = "plugin" ]; then fi 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 + 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 # skype also needs asciidoc |