From beb0f549e68ce3a4fb0b42cda1868b35b6e16f9b Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 17 May 2015 01:13:30 -0300
Subject: 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.
---
 configure | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 9306ab8f..44ea6a29 100755
--- a/configure
+++ b/configure
@@ -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
-- 
cgit v1.2.3