diff options
-rwxr-xr-x | configure | 53 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | doc/tex/Makefile | 9 | ||||
-rw-r--r-- | makeopts.in | 1 |
4 files changed, 59 insertions, 5 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 97745 . +# From configure.ac Revision: 97767 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -712,6 +712,7 @@ LN DOT WGET RUBBER +KPATHSEA FETCH DOWNLOAD SOXMIX @@ -7276,6 +7277,47 @@ echo "${ECHO_T}no" >&6; } fi +# Extract the first word of "kpsewhich", so it can be a program name with args. +set dummy kpsewhich; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_KPATHSEA+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $KPATHSEA in + [\\/]* | ?:[\\/]*) + ac_cv_path_KPATHSEA="$KPATHSEA" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_KPATHSEA="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_KPATHSEA" && ac_cv_path_KPATHSEA=":" + ;; +esac +fi +KPATHSEA=$ac_cv_path_KPATHSEA +if test -n "$KPATHSEA"; then + { echo "$as_me:$LINENO: result: $KPATHSEA" >&5 +echo "${ECHO_T}$KPATHSEA" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "${WGET}" != ":" ; then DOWNLOAD=${WGET} else @@ -48736,11 +48778,11 @@ LN!$LN$ac_delim DOT!$DOT$ac_delim WGET!$WGET$ac_delim RUBBER!$RUBBER$ac_delim +KPATHSEA!$KPATHSEA$ac_delim FETCH!$FETCH$ac_delim DOWNLOAD!$DOWNLOAD$ac_delim SOXMIX!$SOXMIX$ac_delim acx_pthread_config!$acx_pthread_config$ac_delim -PTHREAD_CC!$PTHREAD_CC$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -48782,6 +48824,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PTHREAD_CC!$PTHREAD_CC$ac_delim PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim AST_DEVMODE!$AST_DEVMODE$ac_delim @@ -48878,7 +48921,6 @@ OGG_INCLUDE!$OGG_INCLUDE$ac_delim OGG_DIR!$OGG_DIR$ac_delim PBX_OGG!$PBX_OGG$ac_delim OSPTK_LIB!$OSPTK_LIB$ac_delim -OSPTK_INCLUDE!$OSPTK_INCLUDE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -48920,6 +48962,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +OSPTK_INCLUDE!$OSPTK_INCLUDE$ac_delim OSPTK_DIR!$OSPTK_DIR$ac_delim PBX_OSPTK!$PBX_OSPTK$ac_delim OSS_LIB!$OSS_LIB$ac_delim @@ -49016,7 +49059,6 @@ ZLIB_DIR!$ZLIB_DIR$ac_delim PBX_ZLIB!$PBX_ZLIB$ac_delim ZAPTEL_LIB!$ZAPTEL_LIB$ac_delim ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim -ZAPTEL_DIR!$ZAPTEL_DIR$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -49058,6 +49100,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +ZAPTEL_DIR!$ZAPTEL_DIR$ac_delim PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim ZAPTEL_TRANSCODE_LIB!$ZAPTEL_TRANSCODE_LIB$ac_delim ZAPTEL_TRANSCODE_INCLUDE!$ZAPTEL_TRANSCODE_INCLUDE$ac_delim @@ -49123,7 +49166,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; 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 5e2a56a25..cbc428637 100644 --- a/configure.ac +++ b/configure.ac @@ -162,6 +162,7 @@ AC_PATH_PROG([LN], [ln], :) AC_PATH_PROG([DOT], [dot], :) AC_PATH_PROG([WGET], [wget], :) AC_PATH_PROG([RUBBER], [rubber], :) +AC_PATH_PROG([KPATHSEA], [kpsewhich], :) if test "${WGET}" != ":" ; then DOWNLOAD=${WGET} else diff --git a/doc/tex/Makefile b/doc/tex/Makefile index e0b1ecd9a..70ad5f14a 100644 --- a/doc/tex/Makefile +++ b/doc/tex/Makefile @@ -14,6 +14,15 @@ else @echo "** generated. When complete, it will be ***" @echo "** located at asterisk.pdf. ***" @echo "**********************************************" +ifneq ($(findstring kpsewhich,$(KPATHSEA)),) +ifeq ($(findstring fncychap.sty,$(shell find `$(KPATHSEA) --expand-braces='$$(TEXMF)'| tr -d \! | sed 's/:/ /g'` -name fncychap.sty -print)),) + @echo + @echo "WARNING: The fncychap.sty document was not found" + @echo "On Ubuntu, install the texlive-latex-extra package." + @echo + @exit +endif +endif @cp asterisk.tex asterisk.tex.orig sed -i -e 's/ASTERISKVERSION/$(shell echo $(ASTERISKVERSION) | sed -e 's/\//\\\//g')/' asterisk.tex @$(RUBBER) --pdf asterisk.tex diff --git a/makeopts.in b/makeopts.in index a69803b0a..2d0129b73 100644 --- a/makeopts.in +++ b/makeopts.in @@ -23,6 +23,7 @@ WGET=@WGET@ FETCH=@FETCH@ DOWNLOAD=@DOWNLOAD@ RUBBER=@RUBBER@ +KPATHSEA=@KPATHSEA@ BUILD_PLATFORM=@BUILD_PLATFORM@ BUILD_CPU=@BUILD_CPU@ |