diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | makeopts.in | 2 |
4 files changed, 24 insertions, 8 deletions
@@ -253,8 +253,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 @@ -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 diff --git a/configure.ac b/configure.ac index 2fe6069..7f05619 100644 --- a/configure.ac +++ b/configure.ac @@ -60,12 +60,19 @@ AST_EXT_LIB([ncurses], [initscr], [curses.h], [NCURSES], [ncurses], []) 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 @@ case "$with_ppp" in fi ;; esac -set +x + AC_SUBST(PPPD_VERSION) AC_CONFIG_FILES([build_tools/menuselect-deps makeopts]) diff --git a/makeopts.in b/makeopts.in index 0babc06..8d0ff11 100644 --- a/makeopts.in +++ b/makeopts.in @@ -40,3 +40,5 @@ USB_LIB=@USB_LIB@ USB_INCLUDE=@USB_INCLUDE@ PPPD_VERSION=@PPPD_VERSION@ + +ASCIIDOC=@ASCIIDOC@ |