Changeset beb0f54


Ignore:
Timestamp:
2015-05-17T04:13:30Z (4 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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    rbaa09cc rbeb0f54  
    681681
    682682if [ "$doc" = "1" ]; then
    683         if [ ! -e doc/user-guide/help.txt ] && \
    684              ! type xmlto > /dev/null 2> /dev/null || \
    685              ! type xsltproc > /dev/null 2> /dev/null
    686         then
     683        # check this here just in case someone tries to install it in python2.4...
     684        if ! python -m xml.etree.ElementTree > /dev/null 2>&1; then
    687685                echo
    688                 echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.'
    689                 echo 'Install xmlto and xsltproc if you want online help to work.'
    690         else
    691                 echo "DOC=1" >> Makefile.settings
    692         fi
     686                echo 'ERROR: Python (>=2.5 or 3.x) is required to generate docs'
     687                exit 1
     688        fi
     689        echo "DOC=1" >> Makefile.settings
    693690
    694691        if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
Note: See TracChangeset for help on using the changeset viewer.