[svn-commits] tzafrir: branch 1.4 r2999 - /branches/1.4/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sat Sep  8 07:08:48 2007
New Revision: 2999

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2999
Log:
* Let autoconf figure out the switches for asciidoc.
* Remove some leftover set -x from previous debug...

Modified:
    branches/1.4/Makefile
    branches/1.4/configure
    branches/1.4/configure.ac
    branches/1.4/makeopts.in

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=2999&r1=2998&r2=2999
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Sat Sep  8 07:08:48 2007
@@ -252,8 +252,6 @@
 BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool
 BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS))
 MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
-
-ASCIIDOC	:= asciidoc
 
 all: menuselect.makeopts 
 	@$(MAKE) _all

Modified: branches/1.4/configure
URL: http://svn.digium.com/view/zaptel/branches/1.4/configure?view=diff&rev=2999&r1=2998&r2=2999
==============================================================================
--- branches/1.4/configure (original)
+++ branches/1.4/configure Sat Sep  8 07:08:48 2007
@@ -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 @@
 USB_LIB
 USB_INCLUDE
 PBX_LIBUSB
+ASCIIDOC
 PPPD_VERSION
 LIBOBJS
 LTLIBOBJS'
@@ -5327,6 +5328,14 @@
 
 
 
+# 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 @@
 
 fi
 
-set -x
 # somebody will fix that
 default_ppp_path=/usr
 
@@ -5364,7 +5372,7 @@
 	fi
 	;;
 esac
-set +x
+
 
 
 ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts"
@@ -6068,12 +6076,13 @@
 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

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/zaptel/branches/1.4/configure.ac?view=diff&rev=2999&r1=2998&r2=2999
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Sat Sep  8 07:08:48 2007
@@ -60,12 +60,19 @@
 AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
 AST_EXT_LIB([usb], [usb_init], [usb.h], [USB], [libusb])
 
+# 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
+AC_SUBST(ASCIIDOC)
+
 AC_ARG_WITH(ppp,
 	    [AS_HELP_STRING([--with-ppp=PATH],[Use ppp support from PATH])],
 	    [],
 	    [with_ppp=check]
 	    )
-set -x
 # somebody will fix that
 default_ppp_path=/usr
 
@@ -91,7 +98,7 @@
 	fi
 	;;
 esac
-set +x
+
 AC_SUBST(PPPD_VERSION)
 
 AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])

Modified: branches/1.4/makeopts.in
URL: http://svn.digium.com/view/zaptel/branches/1.4/makeopts.in?view=diff&rev=2999&r1=2998&r2=2999
==============================================================================
--- branches/1.4/makeopts.in (original)
+++ branches/1.4/makeopts.in Sat Sep  8 07:08:48 2007
@@ -40,3 +40,5 @@
 USB_INCLUDE=@USB_INCLUDE@
 
 PPPD_VERSION=@PPPD_VERSION@
+
+ASCIIDOC=@ASCIIDOC@