* Let autoconf figure out the switches for asciidoc.

* Remove some leftover set -x from previous debug...


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2999 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 13 insertions, 4 deletions

diff --git a/configure b/configure
index b625069..058e909 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 2216 .
+# From configure.ac Revision: 2990 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -686,6 +686,7 @@ PBX_LIBNEWT
 USB_LIB
 USB_INCLUDE
 PBX_LIBUSB
+ASCIIDOC
 PPPD_VERSION
 LIBOBJS
 LTLIBOBJS'
@@ -5327,6 +5328,14 @@ fi
 
 
 
+# for asciidoc before ver. 7, the backend must be stated explicitly:
+ASCIIDOC='asciidoc'
+asciidoc_ver=`asciidoc --version 2>&1 | awk '/^asciidoc /{print $2}' | cut -d. -f 1 | head -n 1`
+if test "$asciidoc_ver" != '' && test $asciidoc_ver -lt 7; then
+	ASCIIDOC="asciidoc -b xhtml"
+fi
+
+
 
 # Check whether --with-ppp was given.
 if test "${with_ppp+set}" = set; then
@@ -5336,7 +5345,6 @@ else
 
 fi
 
-set -x
 # somebody will fix that
 default_ppp_path=/usr
 
@@ -5364,7 +5372,7 @@ echo "$as_me: error: failed to find pppd/patchlevel.h: no ppp support." >&2;}
 	fi
 	;;
 esac
-set +x
+
 
 
 ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts"
@@ -6068,12 +6076,13 @@ PBX_LIBNEWT!$PBX_LIBNEWT$ac_delim
 USB_LIB!$USB_LIB$ac_delim
 USB_INCLUDE!$USB_INCLUDE$ac_delim
 PBX_LIBUSB!$PBX_LIBUSB$ac_delim
+ASCIIDOC!$ASCIIDOC$ac_delim
 PPPD_VERSION!$PPPD_VERSION$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5