X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure;h=33dec6d88fc265a7f719a2be19585134b5d553f0;hb=07e3a16bfe2dfc1e6b4d5ad4845a48f69833b363;hp=70107de1bf03511e857bedefae4d3a308ce414bf;hpb=f5a18c364cf7688d9ac6e09996a489a93a821b3c;p=lilypond.git diff --git a/configure b/configure index 70107de1bf..33dec6d88f 100755 --- a/configure +++ b/configure @@ -643,10 +643,15 @@ RSYNC ZIPDOC IMAGEMAGICK NETPBM +TEXINDEX +TEXI2PDF +PDFTEX PDFLATEX +BIBTEX DBLATEX TEXI2HTML MAKEINFO +GHOSTSCRIPT PERL GUILE WINDRES @@ -662,7 +667,6 @@ PKG_CONFIG LIBOBJS T1ASM FONTFORGE -GHOSTSCRIPT PYTHON_CONFIG CXXABI_LIBS GUILE_LDFLAGS @@ -1911,9 +1915,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Bootstrap StepMake configure -# For user package: ac_aux_dir= -for ac_dir in stepmake/bin "$srcdir"/stepmake/bin; do +for ac_dir in config "$srcdir"/config; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1929,8 +1932,8 @@ for ac_dir in stepmake/bin "$srcdir"/stepmake/bin; do fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in stepmake/bin \"$srcdir\"/stepmake/bin" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in stepmake/bin \"$srcdir\"/stepmake/bin" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;} { (exit 1); exit 1; }; } fi @@ -1944,10 +1947,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# For stepmake package: -# AC_CONFIG_AUX_DIR(bin) - - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 @@ -2810,22 +2809,12 @@ fi - unset pv { $as_echo "$as_me:$LINENO: checking for python" >&5 $as_echo_n "checking for python... " >&6; } - for python in $PYTHON python python2 python2.4 python2.3 python2.2 python2.1 python2.0; do - { $as_echo "$as_me:$LINENO: result: $python" >&5 -$as_echo "$python" >&6; } - if ! $python -V > /dev/null 2>&1 ; then - #AC_MSG_WARN([cannot execute $python]) - PYTHON='echo no python' - else - unset pv - - r="`eval echo '$'"python"`" - { $as_echo "$as_me:$LINENO: checking $r version" >&5 -$as_echo_n "checking $r version... " >&6; } - exe=` + python="python" + found="no" + for r in $PYTHON python python3 python3.3 python3.2 python3.1 python3.0 python2 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0; do + exe=` ## which doesn't work in ash, if /usr/bin/which isn't installed ## type -p doesn't work in ash ## command -v doesn't work in zsh @@ -2833,10 +2822,10 @@ $as_echo_n "checking $r version... " >&6; } ## this test should work in ash, bash, pdksh (ksh), zsh type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' ` - if test -n ""; then - ver="" - else - ver=` + if ! $exe -V > /dev/null 2>&1 ; then + continue + fi + ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' ## ## ARG. @@ -2869,8 +2858,7 @@ $as_echo_n "checking $r version... " >&6; } echo "$_ver" #dnl ` - fi - num=` + num=` echo "$ver" | awk -F. ' { if ($3) {three = $3} @@ -2878,7 +2866,7 @@ $as_echo_n "checking $r version... " >&6; } } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` - req=` + req=` echo "1.5" | awk -F. ' { if ($3) {three = $3} @@ -2886,31 +2874,41 @@ $as_echo_n "checking $r version... " >&6; } } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` - { $as_echo "$as_me:$LINENO: result: $ver" >&5 -$as_echo "$ver" >&6; } - if test "$num" -lt "$req"; then - - eval "pv"=\"`eval echo \"'$'pv\" \""$r >= 1.5 (installed: $ver)"\"`\" - - fi - vervar="`echo python | tr 'a-z' 'A-Z'`_VERSION" - eval `echo $vervar=$num` -## AC_SUBST(`eval echo $vervar`) - - if test -z "$pv"; then - PYTHON=$python + sup=` + echo "3.0" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + if test -n "1.5" && test "$num" -lt "$req"; then + python="$r >= 1.5 (installed: $ver)" + continue + else + if test -n "3.0" && test "$num" -ge "$sup"; then + python="$r < 3.0 (installed: $ver)" + continue + else + python=$r + found=$r break fi fi done - if test -n "$pv"; then + { $as_echo "$as_me:$LINENO: result: $found" >&5 +$as_echo "$found" >&6; } + if test "$found" != "no"; then + { $as_echo "$as_me:$LINENO: checking $python version" >&5 +$as_echo_n "checking $python version... " >&6; } + { $as_echo "$as_me:$LINENO: result: $ver" >&5 +$as_echo "$ver" >&6; } + PYTHON=$found + else - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$pv\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$python\"`\" fi - # clear cached value since arg 2 might point us to a new binary - unset ac_cv_path_PYTHON - # Extract the first word of "$PYTHON", so it can be a program name with args. set dummy $PYTHON; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -2990,9 +2988,6 @@ _ACEOF - if test "$datadir" = "\${prefix}/share"; then - datadir='${prefix}/share' - fi presome=${prefix} if test "$prefix" = "NONE"; then presome=${ac_default_prefix} @@ -3000,7 +2995,7 @@ _ACEOF build_package_datadir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/share/$package - DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${prefix}/share!"` + DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${presome}/share!"` DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"` BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"` @@ -3017,11 +3012,14 @@ _ACEOF - - if test "$libdir" = "\${exec_prefix}/lib"; then - libdir='${exec_prefix}/lib' + presome=${exec_prefix} + if test "$presome" = "NONE"; then + presome=${prefix} + fi + if test "$presome" = "NONE"; then + presome=${ac_default_prefix} fi - presome=$exec_prefix + build_package_libdir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/lib/$package LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"` @@ -4232,33 +4230,18 @@ $as_echo "no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking New Century Schoolbook PFB files" >&5 -$as_echo_n "checking New Century Schoolbook PFB files... " >&6; } - - -UNCHECKED_NCSB_SOURCE_FILES="" -if test "$NCSB_DIR" != "" ; then - for f in c059013l c059016l c059033l c059036l; do - if test ! -f "$NCSB_DIR/$f.pfb"; then +{ $as_echo "$as_me:$LINENO: checking for New Century Schoolbook PFB files" >&5 +$as_echo_n "checking for New Century Schoolbook PFB files... " >&6; } - { $as_echo "$as_me:$LINENO: WARNING: $NCSB_DIR does not contain $f.pfb." >&5 -$as_echo "$as_me: WARNING: $NCSB_DIR does not contain $f.pfb." >&2;} - warn_b=yes - else - UNCHECKED_NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $UNCHECKED_NCSB_SOURCE_FILES" - fi - done -else +if test "$NCSB_DIR" = ""; then if test "$FCLIST" != ""; then - for style in Roman Italic "Bold Italic" Bold; do - NCSB_FILE=`$FCLIST "Century Schoolbook L:style=$style:foundry=urw:fontformat=Type 1" file \ - | head -n 1` + NCSB_FILE=`$FCLIST "Century Schoolbook L:foundry=urw:fontformat=Type 1:lang=ru" file \ + | head -n 1` + if test "$NCSB_FILE" != ""; then NCSB_FILE=`echo $NCSB_FILE | sed 's/\(:.*\)$//g'` NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE` - UNCHECKED_NCSB_SOURCE_FILES="$NCSB_FILE $UNCHECKED_NCSB_SOURCE_FILES" - done - NCSB_DIR=`$as_dirname -- $NCSB_FILE || + NCSB_DIR=`$as_dirname -- $NCSB_FILE || $as_expr X$NCSB_FILE : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X$NCSB_FILE : 'X\(//\)[^/]' \| \ X$NCSB_FILE : 'X\(//\)$' \| \ @@ -4281,27 +4264,53 @@ $as_echo X$NCSB_FILE | q } s/.*/./; q'` - else - { $as_echo "$as_me:$LINENO: result: not found" >&5 -$as_echo "not found" >&6; } - echo "Can't find Century Schoolbook files. Install FontConfig's fc-list," - echo "or use --with-ncsb-dir" + fi fi fi -NCSB_SOURCE_FILES="" -for f in $UNCHECKED_NCSB_SOURCE_FILES; do - if test "`grep Cyrillic "$f"`" = ""; then +if test "$NCSB_DIR" != "" ; then + for f in c059013l.pfb c059016l.pfb c059033l.pfb c059036l.pfb; do + if test ! -f "$NCSB_DIR/$f"; then + MISSING_NCSB_SOURCE_FILES="$f $MISSING_NCSB_SOURCE_FILES" + else + if test "`grep Cyrillic "$NCSB_DIR/$f"`" = ""; then + INCOMPLETE_NCSB_SOURCE_FILES="$f $INCOMPLETE_NCSB_SOURCE_FILES" + else + NCSB_SOURCE_FILES="$NCSB_DIR/$f $NCSB_SOURCE_FILES" + fi + fi + done +fi +if test "$NCSB_DIR" = "" -o "$MISSING_NCSB_SOURCE_FILES" != "$INCOMPLETE_NCSB_SOURCE_FILES"; then + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: WARNING: $f does not have Cyrillic characters." >&5 -$as_echo "$as_me: WARNING: $f does not have Cyrillic characters." >&2;} - warn_b=yes + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"International New Century Schoolbook fonts\"`\" - else - NCSB_SOURCE_FILES="$f $NCSB_SOURCE_FILES" + if test "$NCSB_DIR" = ""; then + if test "$FCLIST" = ""; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'(install the fc-list utility from FontConfig, or use --with-ncsb-dir)'\"`\" + + else + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'(make sure the fc-list utility can see them, or use --with-ncsb-dir)'\"`\" + + fi fi -done -{ $as_echo "$as_me:$LINENO: result: $NCSB_SOURCE_FILES" >&5 -$as_echo "$NCSB_SOURCE_FILES" >&6; } + if test "$MISSING_NCSB_SOURCE_FILES" != ""; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'(these files are missing: $MISSING_NCSB_SOURCE_FILES)'\"`\" + + fi + if test "$INCOMPLETE_NCSB_SOURCE_FILES" != ""; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'(these files do not contain Cyrillic characters: $INCOMPLETE_NCSB_SOURCE_FILES)'\"`\" + + fi +else + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -4311,22 +4320,12 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - unset pv { $as_echo "$as_me:$LINENO: checking for python" >&5 $as_echo_n "checking for python... " >&6; } - for python in $PYTHON python python2 python2.4 python2.3 python2.2 python2.1 python2.0; do - { $as_echo "$as_me:$LINENO: result: $python" >&5 -$as_echo "$python" >&6; } - if ! $python -V > /dev/null 2>&1 ; then - #AC_MSG_WARN([cannot execute $python]) - PYTHON='echo no python' - else - unset pv - - r="`eval echo '$'"python"`" - { $as_echo "$as_me:$LINENO: checking $r version" >&5 -$as_echo_n "checking $r version... " >&6; } - exe=` + python="python" + found="no" + for r in $PYTHON python python3 python3.3 python3.2 python3.1 python3.0 python2 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0; do + exe=` ## which doesn't work in ash, if /usr/bin/which isn't installed ## type -p doesn't work in ash ## command -v doesn't work in zsh @@ -4334,10 +4333,10 @@ $as_echo_n "checking $r version... " >&6; } ## this test should work in ash, bash, pdksh (ksh), zsh type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' ` - if test -n ""; then - ver="" - else - ver=` + if ! $exe -V > /dev/null 2>&1 ; then + continue + fi + ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' ## ## ARG. @@ -4370,8 +4369,7 @@ $as_echo_n "checking $r version... " >&6; } echo "$_ver" #dnl ` - fi - num=` + num=` echo "$ver" | awk -F. ' { if ($3) {three = $3} @@ -4379,7 +4377,7 @@ $as_echo_n "checking $r version... " >&6; } } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` - req=` + req=` echo "2.4" | awk -F. ' { if ($3) {three = $3} @@ -4387,31 +4385,41 @@ $as_echo_n "checking $r version... " >&6; } } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` - { $as_echo "$as_me:$LINENO: result: $ver" >&5 -$as_echo "$ver" >&6; } - if test "$num" -lt "$req"; then - - eval "pv"=\"`eval echo \"'$'pv\" \""$r >= 2.4 (installed: $ver)"\"`\" - - fi - vervar="`echo python | tr 'a-z' 'A-Z'`_VERSION" - eval `echo $vervar=$num` -## AC_SUBST(`eval echo $vervar`) - - if test -z "$pv"; then - PYTHON=$python + sup=` + echo "3.0" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + if test -n "2.4" && test "$num" -lt "$req"; then + python="$r >= 2.4 (installed: $ver)" + continue + else + if test -n "3.0" && test "$num" -ge "$sup"; then + python="$r < 3.0 (installed: $ver)" + continue + else + python=$r + found=$r break fi fi done - if test -n "$pv"; then + { $as_echo "$as_me:$LINENO: result: $found" >&5 +$as_echo "$found" >&6; } + if test "$found" != "no"; then + { $as_echo "$as_me:$LINENO: checking $python version" >&5 +$as_echo_n "checking $python version... " >&6; } + { $as_echo "$as_me:$LINENO: result: $ver" >&5 +$as_echo "$ver" >&6; } + PYTHON=$found + else - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$pv\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$python\"`\" fi - # clear cached value since arg 2 might point us to a new binary - unset ac_cv_path_PYTHON - # Extract the first word of "$PYTHON", so it can be a program name with args. set dummy $PYTHON; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -6524,9 +6532,9 @@ test -n "$BISON" || BISON="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"bison\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"bison\"`\" - if test "OPTIONAL" = "REQUIRED"; then + if test "REQUIRED" = "REQUIRED"; then command="echo ERROR: bison not found" # abort configure process here? else @@ -6608,7 +6616,7 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= (installed: $ver)"\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi vervar="`echo BISON | tr 'a-z' 'A-Z'`_VERSION" @@ -6689,7 +6697,7 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= 1.29 (installed: $ver)"\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 1.29 (installed: $ver)"\"`\" fi vervar="`echo BISON | tr 'a-z' 'A-Z'`_VERSION" @@ -8036,6 +8044,55 @@ $as_echo "$ver" >&6; } fi + if test "$METAPOST" != ""; then + ver=` + ## "$METAPOST" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' + ## + ## ARG. + ## Workaround for broken Debian gcc version string: + ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) + ## + ## -V: Workaround for python + + #dnl + + ## Assume and hunt for dotted version multiplet. + ## use eval trickery, because we cannot use multi-level $() instead of `` + ## for compatibility reasons. + + ## grab the first version number in --version output. + eval _ver=\"\`("$METAPOST" --version || "$METAPOST" -V) 2>&1 | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1 | + tr ' ' '\n' | + sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1\`\" + + if test -z "$_ver"; then + ## If empty, try date [fontforge] + eval _ver=\"\`("$METAPOST" --version || "$METAPOST" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi + echo "$_ver" + #dnl +` + num=` + echo "$ver" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + # Avoid buggy metapost versions: 1.600 <= x < 1.803 + if test "$num" -ge "1600000" -a "$num" -lt "1803000"; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""mpost (due to a bug in metapost, versions 1.600 <= x < 1.803 are not supported; installed: $ver)"\"`\" + + fi + fi { $as_echo "$as_me:$LINENO: checking for working metafont mode" >&5 $as_echo_n "checking for working metafont mode... " >&6; } @@ -8054,7 +8111,6 @@ $as_echo "$MFMODE" >&6; } - # ugh for ac_prog in kpsewhich do @@ -8111,9 +8167,9 @@ test -n "$KPSEWHICH" || KPSEWHICH="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"kpsewhich\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"kpsewhich\"`\" - if test "OPTIONAL" = "REQUIRED"; then + if test "REQUIRED" = "REQUIRED"; then command="echo ERROR: kpsewhich not found" # abort configure process here? else @@ -8195,7 +8251,7 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= (installed: $ver)"\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi vervar="`echo KPSEWHICH | tr 'a-z' 'A-Z'`_VERSION" @@ -8205,74 +8261,32 @@ $as_echo "$ver" >&6; } fi - - ## First, let's just see if we can find Guile at all. - test -n "$target_alias" && target_guile_config=$target_alias-guile-config - test -n "$host_alias" && host_guile_config=$host_alias-guile-config - { $as_echo "$as_me:$LINENO: checking for guile-config" >&5 -$as_echo_n "checking for guile-config... " >&6; } - for guile_config in $GUILE_CONFIG $target_guile_config $host_guile_config $build_guile_config guile-config guile1-config; do - { $as_echo "$as_me:$LINENO: result: $guile_config" >&5 -$as_echo "$guile_config" >&6; } - if ! $guile_config --version > /dev/null 2>&1 ; then - { $as_echo "$as_me:$LINENO: WARNING: cannot execute $guile_config" >&5 -$as_echo "$as_me: WARNING: cannot execute $guile_config" >&2;} - { $as_echo "$as_me:$LINENO: checking if we are cross compiling" >&5 -$as_echo_n "checking if we are cross compiling... " >&6; } - GUILE_CONFIG='echo no guile-config' - else - GUILE_CONFIG=$guile_config - break - fi - done - - - r="`eval echo '$'"GUILE_CONFIG"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"GUILE_CONFIG"`' : '.*\(echo\)' > /dev/null; then - true - else - ##STEPMAKE_WARN(cannot find . ) - false - fi - - if test $? -ne 0; then - - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$guile_config\"`\" - - if test "REQUIRED" = "REQUIRED"; then - command="echo ERROR: $guile_config not found" - # abort configure process here? - else - command="- echo $guile_config not found" - fi - eval "GUILE_CONFIG"='$command' - false - else - true - fi - - if test $? -ne 0; then - - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'guile-config (guile-devel, guile-dev or libguile-dev package) or guile1-config (guile1-devel package)'\"`\" - + { $as_echo "$as_me:$LINENO: checking for metapost required files" >&5 +$as_echo_n "checking for metapost required files... " >&6; } + if test "$MFPLAIN_MP" = ""; then + MFPLAIN_MP=`kpsewhich -format=mp mfplain` fi + if test "$MFPLAIN_MP" = ""; then + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'metapost CTAN package (texlive-metapost)'\"`\" - r="`eval echo '$'"GUILE_CONFIG"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"GUILE_CONFIG"`' : '.*\(echo\)' > /dev/null; then - true else - ##STEPMAKE_WARN(cannot find . ) - false + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } fi - # urg. should test functionality rather than version. - if test $? -eq 0 -a -n "1.8.2"; then - r="`eval echo '$'"GUILE_CONFIG"`" - { $as_echo "$as_me:$LINENO: checking $r version" >&5 -$as_echo_n "checking $r version... " >&6; } - exe=` + ## First, let's just see if we can find Guile at all. + test -n "$target_alias" && target_guile_config=$target_alias-guile-config + test -n "$host_alias" && host_guile_config=$host_alias-guile-config + { $as_echo "$as_me:$LINENO: checking for guile-config" >&5 +$as_echo_n "checking for guile-config... " >&6; } + guile_config="guile-config" + found="no" + for r in $GUILE_CONFIG $target_guile_config $host_guile_config $build_guile_config guile-config guile2-config guile2.0-config guile-2.0-config guile1-config guile1.9-config guile1.8-config guile-1-config guile-1.9-config guile-1.8-config; do + exe=` ## which doesn't work in ash, if /usr/bin/which isn't installed ## type -p doesn't work in ash ## command -v doesn't work in zsh @@ -8280,10 +8294,10 @@ $as_echo_n "checking $r version... " >&6; } ## this test should work in ash, bash, pdksh (ksh), zsh type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' ` - if test -n ""; then - ver="" - else - ver=` + if ! $exe --version > /dev/null 2>&1 ; then + continue + fi + ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' ## ## ARG. @@ -8316,8 +8330,7 @@ $as_echo_n "checking $r version... " >&6; } echo "$_ver" #dnl ` - fi - num=` + num=` echo "$ver" | awk -F. ' { if ($3) {three = $3} @@ -8325,7 +8338,7 @@ $as_echo_n "checking $r version... " >&6; } } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` - req=` + req=` echo "1.8.2" | awk -F. ' { if ($3) {three = $3} @@ -8333,16 +8346,39 @@ $as_echo_n "checking $r version... " >&6; } } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` - { $as_echo "$as_me:$LINENO: result: $ver" >&5 + sup=` + echo "1.9.0" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + if test -n "1.8.2" -a "$num" -lt "$req"; then + guile_config="$r >= 1.8.2 (installed: $ver)" + continue + else + if test -n "1.9.0" -a "$num" -ge "$sup"; then + guile_config="$r < 1.9.0 (installed: $ver)" + continue + else + guile_config=$r + found=$r + break + fi + fi + done + { $as_echo "$as_me:$LINENO: result: $found" >&5 +$as_echo "$found" >&6; } + if test "$found" != "no"; then + { $as_echo "$as_me:$LINENO: checking $guile_config version" >&5 +$as_echo_n "checking $guile_config version... " >&6; } + { $as_echo "$as_me:$LINENO: result: $ver" >&5 $as_echo "$ver" >&6; } - if test "$num" -lt "$req"; then - - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 1.8.2 (installed: $ver)"\"`\" + GUILE_CONFIG=$found + else - fi - vervar="`echo GUILE_CONFIG | tr 'a-z' 'A-Z'`_VERSION" - eval `echo $vervar=$num` -## AC_SUBST(`eval echo $vervar`) + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$guile_config (guile-devel, guile-dev or libguile-dev package) or guile1-config (guile1-devel package)"\"`\" fi @@ -9250,35 +9286,178 @@ $as_echo "$as_me: WARNING: Usage: --with-python-lib=name" >&2;} fi - for ac_prog in python-config -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_PYTHON_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$PYTHON_CONFIG"; then - ac_cv_prog_PYTHON_CONFIG="$PYTHON_CONFIG" # Let the user override the test. -else -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_prog_PYTHON_CONFIG="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS -fi -fi + { $as_echo "$as_me:$LINENO: checking for python" >&5 +$as_echo_n "checking for python... " >&6; } + python="python" + found="no" + for r in $PYTHON python python3 python3.3 python3.2 python3.1 python3.0 python2 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0; do + exe=` + ## which doesn't work in ash, if /usr/bin/which isn't installed + ## type -p doesn't work in ash + ## command -v doesn't work in zsh + ## command -v "$r" 2>&1 + ## this test should work in ash, bash, pdksh (ksh), zsh + type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' +` + if ! $exe -V > /dev/null 2>&1 ; then + continue + fi + ver=` + ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' + ## + ## ARG. + ## Workaround for broken Debian gcc version string: + ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) + ## + ## -V: Workaround for python + + #dnl + + ## Assume and hunt for dotted version multiplet. + ## use eval trickery, because we cannot use multi-level $() instead of `` + ## for compatibility reasons. + + ## grab the first version number in --version output. + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1 | + tr ' ' '\n' | + sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1\`\" + + if test -z "$_ver"; then + ## If empty, try date [fontforge] + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi + echo "$_ver" + #dnl +` + num=` + echo "$ver" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + req=` + echo "2.4" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + sup=` + echo "3.0" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + if test -n "2.4" && test "$num" -lt "$req"; then + python="$r >= 2.4 (installed: $ver)" + continue + else + if test -n "3.0" && test "$num" -ge "$sup"; then + python="$r < 3.0 (installed: $ver)" + continue + else + python=$r + found=$r + break + fi + fi + done + { $as_echo "$as_me:$LINENO: result: $found" >&5 +$as_echo "$found" >&6; } + if test "$found" != "no"; then + { $as_echo "$as_me:$LINENO: checking $python version" >&5 +$as_echo_n "checking $python version... " >&6; } + { $as_echo "$as_me:$LINENO: result: $ver" >&5 +$as_echo "$ver" >&6; } + PYTHON=$found + else + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$python\"`\" + + fi + # Extract the first word of "$PYTHON", so it can be a program name with args. +set dummy $PYTHON; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PYTHON+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $PYTHON in + [\\/]* | ?:[\\/]*) + ac_cv_path_PYTHON="$PYTHON" # 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_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PYTHON=$ac_cv_path_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + + for ac_prog in `basename $PYTHON`-config +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_PYTHON_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$PYTHON_CONFIG"; then + ac_cv_prog_PYTHON_CONFIG="$PYTHON_CONFIG" # Let the user override the test. +else +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_prog_PYTHON_CONFIG="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi PYTHON_CONFIG=$ac_cv_prog_PYTHON_CONFIG if test -n "$PYTHON_CONFIG"; then { $as_echo "$as_me:$LINENO: result: $PYTHON_CONFIG" >&5 @@ -9474,17 +9653,17 @@ done - for ac_prog in gs + for ac_prog in fontforge do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_GHOSTSCRIPT+set}" = set; then +if test "${ac_cv_prog_FONTFORGE+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$GHOSTSCRIPT"; then - ac_cv_prog_GHOSTSCRIPT="$GHOSTSCRIPT" # Let the user override the test. + if test -n "$FONTFORGE"; then + ac_cv_prog_FONTFORGE="$FONTFORGE" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -9493,7 +9672,7 @@ do 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_prog_GHOSTSCRIPT="$ac_prog" + ac_cv_prog_FONTFORGE="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -9503,24 +9682,24 @@ IFS=$as_save_IFS fi fi -GHOSTSCRIPT=$ac_cv_prog_GHOSTSCRIPT -if test -n "$GHOSTSCRIPT"; then - { $as_echo "$as_me:$LINENO: result: $GHOSTSCRIPT" >&5 -$as_echo "$GHOSTSCRIPT" >&6; } +FONTFORGE=$ac_cv_prog_FONTFORGE +if test -n "$FONTFORGE"; then + { $as_echo "$as_me:$LINENO: result: $FONTFORGE" >&5 +$as_echo "$FONTFORGE" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$GHOSTSCRIPT" && break + test -n "$FONTFORGE" && break done -test -n "$GHOSTSCRIPT" || GHOSTSCRIPT="no" +test -n "$FONTFORGE" || FONTFORGE="no" - r="`eval echo '$'"GHOSTSCRIPT"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"GHOSTSCRIPT"`' : '.*\(echo\)' > /dev/null; then + r="`eval echo '$'"FONTFORGE"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"FONTFORGE"`' : '.*\(echo\)' > /dev/null; then true else ##STEPMAKE_WARN(cannot find . ) @@ -9529,33 +9708,33 @@ test -n "$GHOSTSCRIPT" || GHOSTSCRIPT="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"gs\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"fontforge\"`\" - if test "OPTIONAL" = "REQUIRED"; then - command="echo ERROR: gs not found" + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: fontforge not found" # abort configure process here? else - command="- echo gs not found" + command="- echo fontforge not found" fi - eval "GHOSTSCRIPT"='$command' + eval "FONTFORGE"='$command' false else true fi if test $? -eq 0; then - for ac_prog in gs + for ac_prog in fontforge do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GHOSTSCRIPT+set}" = set; then +if test "${ac_cv_path_FONTFORGE+set}" = set; then $as_echo_n "(cached) " >&6 else - case $GHOSTSCRIPT in + case $FONTFORGE in [\\/]* | ?:[\\/]*) - ac_cv_path_GHOSTSCRIPT="$GHOSTSCRIPT" # Let the user override the test with a path. + ac_cv_path_FONTFORGE="$FONTFORGE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9565,7 +9744,7 @@ do 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_GHOSTSCRIPT="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_FONTFORGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -9576,22 +9755,22 @@ IFS=$as_save_IFS ;; esac fi -GHOSTSCRIPT=$ac_cv_path_GHOSTSCRIPT -if test -n "$GHOSTSCRIPT"; then - { $as_echo "$as_me:$LINENO: result: $GHOSTSCRIPT" >&5 -$as_echo "$GHOSTSCRIPT" >&6; } +FONTFORGE=$ac_cv_path_FONTFORGE +if test -n "$FONTFORGE"; then + { $as_echo "$as_me:$LINENO: result: $FONTFORGE" >&5 +$as_echo "$FONTFORGE" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$GHOSTSCRIPT" && break + test -n "$FONTFORGE" && break done - if test -n "8.60"; then + if test -n "20110222"; then - r="`eval echo '$'"GHOSTSCRIPT"`" + r="`eval echo '$'"FONTFORGE"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -9648,7 +9827,7 @@ $as_echo_n "checking $r version... " >&6; } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` req=` - echo "8.60" | awk -F. ' + echo "20110222" | awk -F. ' { if ($3) {three = $3} else {three = 0} @@ -9659,10 +9838,10 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= 8.60 (installed: $ver)"\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 20110222 (installed: $ver)"\"`\" fi - vervar="`echo GHOSTSCRIPT | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo FONTFORGE | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) @@ -9671,17 +9850,17 @@ $as_echo "$ver" >&6; } - for ac_prog in fontforge + for ac_prog in t1asm do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_FONTFORGE+set}" = set; then +if test "${ac_cv_prog_T1ASM+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$FONTFORGE"; then - ac_cv_prog_FONTFORGE="$FONTFORGE" # Let the user override the test. + if test -n "$T1ASM"; then + ac_cv_prog_T1ASM="$T1ASM" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -9690,7 +9869,7 @@ do 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_prog_FONTFORGE="$ac_prog" + ac_cv_prog_T1ASM="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -9700,24 +9879,24 @@ IFS=$as_save_IFS fi fi -FONTFORGE=$ac_cv_prog_FONTFORGE -if test -n "$FONTFORGE"; then - { $as_echo "$as_me:$LINENO: result: $FONTFORGE" >&5 -$as_echo "$FONTFORGE" >&6; } +T1ASM=$ac_cv_prog_T1ASM +if test -n "$T1ASM"; then + { $as_echo "$as_me:$LINENO: result: $T1ASM" >&5 +$as_echo "$T1ASM" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$FONTFORGE" && break + test -n "$T1ASM" && break done -test -n "$FONTFORGE" || FONTFORGE="no" +test -n "$T1ASM" || T1ASM="no" - r="`eval echo '$'"FONTFORGE"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"FONTFORGE"`' : '.*\(echo\)' > /dev/null; then + r="`eval echo '$'"T1ASM"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"T1ASM"`' : '.*\(echo\)' > /dev/null; then true else ##STEPMAKE_WARN(cannot find . ) @@ -9726,33 +9905,33 @@ test -n "$FONTFORGE" || FONTFORGE="no" if test $? -ne 0; then - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"fontforge\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"t1asm\"`\" if test "REQUIRED" = "REQUIRED"; then - command="echo ERROR: fontforge not found" + command="echo ERROR: t1asm not found" # abort configure process here? else - command="- echo fontforge not found" + command="- echo t1asm not found" fi - eval "FONTFORGE"='$command' + eval "T1ASM"='$command' false else true fi if test $? -eq 0; then - for ac_prog in fontforge + for ac_prog in t1asm do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_FONTFORGE+set}" = set; then +if test "${ac_cv_path_T1ASM+set}" = set; then $as_echo_n "(cached) " >&6 else - case $FONTFORGE in + case $T1ASM in [\\/]* | ?:[\\/]*) - ac_cv_path_FONTFORGE="$FONTFORGE" # Let the user override the test with a path. + ac_cv_path_T1ASM="$T1ASM" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9762,204 +9941,7 @@ do 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_FONTFORGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -FONTFORGE=$ac_cv_path_FONTFORGE -if test -n "$FONTFORGE"; then - { $as_echo "$as_me:$LINENO: result: $FONTFORGE" >&5 -$as_echo "$FONTFORGE" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$FONTFORGE" && break -done - - if test -n "20110222"; then - - r="`eval echo '$'"FONTFORGE"`" - { $as_echo "$as_me:$LINENO: checking $r version" >&5 -$as_echo_n "checking $r version... " >&6; } - exe=` - ## which doesn't work in ash, if /usr/bin/which isn't installed - ## type -p doesn't work in ash - ## command -v doesn't work in zsh - ## command -v "$r" 2>&1 - ## this test should work in ash, bash, pdksh (ksh), zsh - type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' -` - if test -n ""; then - ver="" - else - ver=` - ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' - ## - ## ARG. - ## Workaround for broken Debian gcc version string: - ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) - ## - ## -V: Workaround for python - - #dnl - - ## Assume and hunt for dotted version multiplet. - ## use eval trickery, because we cannot use multi-level $() instead of `` - ## for compatibility reasons. - - ## grab the first version number in --version output. - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | - grep -E '(^| )[0-9][0-9]*\.[0-9]' | - head -n 1 | - tr ' ' '\n' | - sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | - grep -E '(^| )[0-9][0-9]*\.[0-9]' | - head -n 1\`\" - - if test -z "$_ver"; then - ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ - | head -n 1 \ - | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" - fi - echo "$_ver" - #dnl -` - fi - num=` - echo "$ver" | awk -F. ' - { - if ($3) {three = $3} - else {three = 0} - } - {printf "%.0f\n", $1*1000000 + $2*1000 + three}' -` - req=` - echo "20110222" | awk -F. ' - { - if ($3) {three = $3} - else {three = 0} - } - {printf "%.0f\n", $1*1000000 + $2*1000 + three}' -` - { $as_echo "$as_me:$LINENO: result: $ver" >&5 -$as_echo "$ver" >&6; } - if test "$num" -lt "$req"; then - - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 20110222 (installed: $ver)"\"`\" - - fi - vervar="`echo FONTFORGE | tr 'a-z' 'A-Z'`_VERSION" - eval `echo $vervar=$num` -## AC_SUBST(`eval echo $vervar`) - - fi - fi - - - - for ac_prog in t1asm -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_T1ASM+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$T1ASM"; then - ac_cv_prog_T1ASM="$T1ASM" # Let the user override the test. -else -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_prog_T1ASM="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -T1ASM=$ac_cv_prog_T1ASM -if test -n "$T1ASM"; then - { $as_echo "$as_me:$LINENO: result: $T1ASM" >&5 -$as_echo "$T1ASM" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$T1ASM" && break -done -test -n "$T1ASM" || T1ASM="no" - - - - r="`eval echo '$'"T1ASM"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"T1ASM"`' : '.*\(echo\)' > /dev/null; then - true - else - ##STEPMAKE_WARN(cannot find . ) - false - fi - - if test $? -ne 0; then - - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"t1asm\"`\" - - if test "REQUIRED" = "REQUIRED"; then - command="echo ERROR: t1asm not found" - # abort configure process here? - else - command="- echo t1asm not found" - fi - eval "T1ASM"='$command' - false - else - true - fi - - if test $? -eq 0; then - for ac_prog in t1asm -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_T1ASM+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $T1ASM in - [\\/]* | ?:[\\/]*) - ac_cv_path_T1ASM="$T1ASM" # 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_T1ASM="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_T1ASM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -11881,52 +11863,150 @@ $as_echo "$ver" >&6; } -## Optional tools for building documentation, website, extra fonts. - # guile executable for some scripts + { $as_echo "$as_me:$LINENO: checking for guile" >&5 +$as_echo_n "checking for guile... " >&6; } + guile="guile" + found="no" + for r in $GUILE guile guile2 guile2.0 guile-2.0 guile1 guile1.9 guile1.8 guile-1 guile-1.9 guile-1.8; do + exe=` + ## which doesn't work in ash, if /usr/bin/which isn't installed + ## type -p doesn't work in ash + ## command -v doesn't work in zsh + ## command -v "$r" 2>&1 + ## this test should work in ash, bash, pdksh (ksh), zsh + type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' +` + if ! $exe --version > /dev/null 2>&1 ; then + continue + fi + ver=` + ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' + ## + ## ARG. + ## Workaround for broken Debian gcc version string: + ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) + ## + ## -V: Workaround for python - for ac_prog in guile guile1 -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_GUILE+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$GUILE"; then - ac_cv_prog_GUILE="$GUILE" # Let the user override the test. -else -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_prog_GUILE="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + #dnl -fi -fi -GUILE=$ac_cv_prog_GUILE -if test -n "$GUILE"; then - { $as_echo "$as_me:$LINENO: result: $GUILE" >&5 -$as_echo "$GUILE" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi + ## Assume and hunt for dotted version multiplet. + ## use eval trickery, because we cannot use multi-level $() instead of `` + ## for compatibility reasons. + ## grab the first version number in --version output. + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1 | + tr ' ' '\n' | + sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1\`\" - test -n "$GUILE" && break -done + if test -z "$_ver"; then + ## If empty, try date [fontforge] + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi + echo "$_ver" + #dnl +` + num=` + echo "$ver" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + req=` + echo "1.8.2" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + sup=` + echo "1.9.0" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + if test -n "1.8.2" && test "$num" -lt "$req"; then + guile="$r >= 1.8.2 (installed: $ver)" + continue + else + if test -n "1.9.0" && test "$num" -ge "$sup"; then + guile="$r < 1.9.0 (installed: $ver)" + continue + else + guile=$r + found=$r + break + fi + fi + done + { $as_echo "$as_me:$LINENO: result: $found" >&5 +$as_echo "$found" >&6; } + if test "$found" != "no"; then + { $as_echo "$as_me:$LINENO: checking $guile version" >&5 +$as_echo_n "checking $guile version... " >&6; } + { $as_echo "$as_me:$LINENO: result: $ver" >&5 +$as_echo "$ver" >&6; } + GUILE=$found + else + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"$guile\"`\" + + fi + + for ac_prog in $GUILE +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_GUILE+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$GUILE"; then + ac_cv_prog_GUILE="$GUILE" # Let the user override the test. +else +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_prog_GUILE="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +GUILE=$ac_cv_prog_GUILE +if test -n "$GUILE"; then + { $as_echo "$as_me:$LINENO: result: $GUILE" >&5 +$as_echo "$GUILE" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$GUILE" && break +done test -n "$GUILE" || GUILE="no" @@ -11941,13 +12021,13 @@ test -n "$GUILE" || GUILE="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"guile guile1\"`\" + eval ""=\"`eval echo \"'$'\" \"$GUILE\"`\" - if test "OPTIONAL" = "REQUIRED"; then - command="echo ERROR: guile guile1 not found" + if test "" = "REQUIRED"; then + command="echo ERROR: $GUILE not found" # abort configure process here? else - command="- echo guile guile1 not found" + command="- echo $GUILE not found" fi eval "GUILE"='$command' false @@ -11955,29 +12035,857 @@ test -n "$GUILE" || GUILE="no" true fi - if test $? -eq 0; then - for ac_prog in guile guile1 + if test $? -eq 0; then + for ac_prog in $GUILE +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GUILE+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $GUILE in + [\\/]* | ?:[\\/]*) + ac_cv_path_GUILE="$GUILE" # 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_GUILE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +GUILE=$ac_cv_path_GUILE +if test -n "$GUILE"; then + { $as_echo "$as_me:$LINENO: result: $GUILE" >&5 +$as_echo "$GUILE" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$GUILE" && break +done + + if test -n ""; then + + r="`eval echo '$'"GUILE"`" + { $as_echo "$as_me:$LINENO: checking $r version" >&5 +$as_echo_n "checking $r version... " >&6; } + exe=` + ## which doesn't work in ash, if /usr/bin/which isn't installed + ## type -p doesn't work in ash + ## command -v doesn't work in zsh + ## command -v "$r" 2>&1 + ## this test should work in ash, bash, pdksh (ksh), zsh + type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' +` + if test -n ""; then + ver="" + else + ver=` + ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' + ## + ## ARG. + ## Workaround for broken Debian gcc version string: + ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) + ## + ## -V: Workaround for python + + #dnl + + ## Assume and hunt for dotted version multiplet. + ## use eval trickery, because we cannot use multi-level $() instead of `` + ## for compatibility reasons. + + ## grab the first version number in --version output. + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1 | + tr ' ' '\n' | + sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1\`\" + + if test -z "$_ver"; then + ## If empty, try date [fontforge] + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi + echo "$_ver" + #dnl +` + fi + num=` + echo "$ver" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + req=` + echo "" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + { $as_echo "$as_me:$LINENO: result: $ver" >&5 +$as_echo "$ver" >&6; } + if test "$num" -lt "$req"; then + + eval ""=\"`eval echo \"'$'\" \""$r >= (installed: $ver)"\"`\" + + fi + vervar="`echo GUILE | tr 'a-z' 'A-Z'`_VERSION" + eval `echo $vervar=$num` +## AC_SUBST(`eval echo $vervar`) + + fi + fi + + + +# perl for help2man and for mf2pt1.pl + + + for ac_prog in perl +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_PERL+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$PERL"; then + ac_cv_prog_PERL="$PERL" # Let the user override the test. +else +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_prog_PERL="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PERL=$ac_cv_prog_PERL +if test -n "$PERL"; then + { $as_echo "$as_me:$LINENO: result: $PERL" >&5 +$as_echo "$PERL" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$PERL" && break +done +test -n "$PERL" || PERL="no" + + + + r="`eval echo '$'"PERL"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"PERL"`' : '.*\(echo\)' > /dev/null; then + true + else + ##STEPMAKE_WARN(cannot find . ) + false + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"perl\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: perl not found" + # abort configure process here? + else + command="- echo perl not found" + fi + eval "PERL"='$command' + false + else + true + fi + + if test $? -eq 0; then + for ac_prog in perl +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PERL+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERL="$PERL" # 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_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PERL=$ac_cv_path_PERL +if test -n "$PERL"; then + { $as_echo "$as_me:$LINENO: result: $PERL" >&5 +$as_echo "$PERL" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$PERL" && break +done + + if test -n ""; then + + r="`eval echo '$'"PERL"`" + { $as_echo "$as_me:$LINENO: checking $r version" >&5 +$as_echo_n "checking $r version... " >&6; } + exe=` + ## which doesn't work in ash, if /usr/bin/which isn't installed + ## type -p doesn't work in ash + ## command -v doesn't work in zsh + ## command -v "$r" 2>&1 + ## this test should work in ash, bash, pdksh (ksh), zsh + type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' +` + if test -n ""; then + ver="" + else + ver=` + ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' + ## + ## ARG. + ## Workaround for broken Debian gcc version string: + ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) + ## + ## -V: Workaround for python + + #dnl + + ## Assume and hunt for dotted version multiplet. + ## use eval trickery, because we cannot use multi-level $() instead of `` + ## for compatibility reasons. + + ## grab the first version number in --version output. + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1 | + tr ' ' '\n' | + sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1\`\" + + if test -z "$_ver"; then + ## If empty, try date [fontforge] + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi + echo "$_ver" + #dnl +` + fi + num=` + echo "$ver" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + req=` + echo "" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + { $as_echo "$as_me:$LINENO: result: $ver" >&5 +$as_echo "$ver" >&6; } + if test "$num" -lt "$req"; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= (installed: $ver)"\"`\" + + fi + vervar="`echo PERL | tr 'a-z' 'A-Z'`_VERSION" + eval `echo $vervar=$num` +## AC_SUBST(`eval echo $vervar`) + + fi + fi + + + +## Optional tools for building documentation, website, extra fonts. +if test "$DOCUMENTATION" = "yes"; then + DOCUMENTATION_REQUIRED=REQUIRED +else + DOCUMENTATION_REQUIRED=OPTIONAL +fi + + + for ac_prog in gs +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_GHOSTSCRIPT+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$GHOSTSCRIPT"; then + ac_cv_prog_GHOSTSCRIPT="$GHOSTSCRIPT" # Let the user override the test. +else +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_prog_GHOSTSCRIPT="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +GHOSTSCRIPT=$ac_cv_prog_GHOSTSCRIPT +if test -n "$GHOSTSCRIPT"; then + { $as_echo "$as_me:$LINENO: result: $GHOSTSCRIPT" >&5 +$as_echo "$GHOSTSCRIPT" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$GHOSTSCRIPT" && break +done +test -n "$GHOSTSCRIPT" || GHOSTSCRIPT="no" + + + + r="`eval echo '$'"GHOSTSCRIPT"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"GHOSTSCRIPT"`' : '.*\(echo\)' > /dev/null; then + true + else + ##STEPMAKE_WARN(cannot find . ) + false + fi + + if test $? -ne 0; then + + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"gs\"`\" + + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + command="echo ERROR: gs not found" + # abort configure process here? + else + command="- echo gs not found" + fi + eval "GHOSTSCRIPT"='$command' + false + else + true + fi + + if test $? -eq 0; then + for ac_prog in gs +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GHOSTSCRIPT+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $GHOSTSCRIPT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GHOSTSCRIPT="$GHOSTSCRIPT" # 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_GHOSTSCRIPT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +GHOSTSCRIPT=$ac_cv_path_GHOSTSCRIPT +if test -n "$GHOSTSCRIPT"; then + { $as_echo "$as_me:$LINENO: result: $GHOSTSCRIPT" >&5 +$as_echo "$GHOSTSCRIPT" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$GHOSTSCRIPT" && break +done + + if test -n "8.60"; then + + r="`eval echo '$'"GHOSTSCRIPT"`" + { $as_echo "$as_me:$LINENO: checking $r version" >&5 +$as_echo_n "checking $r version... " >&6; } + exe=` + ## which doesn't work in ash, if /usr/bin/which isn't installed + ## type -p doesn't work in ash + ## command -v doesn't work in zsh + ## command -v "$r" 2>&1 + ## this test should work in ash, bash, pdksh (ksh), zsh + type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' +` + if test -n ""; then + ver="" + else + ver=` + ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' + ## + ## ARG. + ## Workaround for broken Debian gcc version string: + ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) + ## + ## -V: Workaround for python + + #dnl + + ## Assume and hunt for dotted version multiplet. + ## use eval trickery, because we cannot use multi-level $() instead of `` + ## for compatibility reasons. + + ## grab the first version number in --version output. + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1 | + tr ' ' '\n' | + sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1\`\" + + if test -z "$_ver"; then + ## If empty, try date [fontforge] + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi + echo "$_ver" + #dnl +` + fi + num=` + echo "$ver" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + req=` + echo "8.60" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + { $as_echo "$as_me:$LINENO: result: $ver" >&5 +$as_echo "$ver" >&6; } + if test "$num" -lt "$req"; then + + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= 8.60 (installed: $ver)"\"`\" + + fi + vervar="`echo GHOSTSCRIPT | tr 'a-z' 'A-Z'`_VERSION" + eval `echo $vervar=$num` +## AC_SUBST(`eval echo $vervar`) + + fi + fi + + + + for ac_prog in makeinfo +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_MAKEINFO+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$MAKEINFO"; then + ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. +else +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_prog_MAKEINFO="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +MAKEINFO=$ac_cv_prog_MAKEINFO +if test -n "$MAKEINFO"; then + { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5 +$as_echo "$MAKEINFO" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$MAKEINFO" && break +done +test -n "$MAKEINFO" || MAKEINFO="no" + + + + r="`eval echo '$'"MAKEINFO"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"MAKEINFO"`' : '.*\(echo\)' > /dev/null; then + true + else + ##STEPMAKE_WARN(cannot find . ) + false + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"makeinfo\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: makeinfo not found" + # abort configure process here? + else + command="- echo makeinfo not found" + fi + eval "MAKEINFO"='$command' + false + else + true + fi + + if test $? -eq 0 -a -n "4.11"; then + + r="`eval echo '$'"MAKEINFO"`" + { $as_echo "$as_me:$LINENO: checking $r version" >&5 +$as_echo_n "checking $r version... " >&6; } + exe=` + ## which doesn't work in ash, if /usr/bin/which isn't installed + ## type -p doesn't work in ash + ## command -v doesn't work in zsh + ## command -v "$r" 2>&1 + ## this test should work in ash, bash, pdksh (ksh), zsh + type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' +` + if test -n ""; then + ver="" + else + ver=` + ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' + ## + ## ARG. + ## Workaround for broken Debian gcc version string: + ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) + ## + ## -V: Workaround for python + + #dnl + + ## Assume and hunt for dotted version multiplet. + ## use eval trickery, because we cannot use multi-level $() instead of `` + ## for compatibility reasons. + + ## grab the first version number in --version output. + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1 | + tr ' ' '\n' | + sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1\`\" + + if test -z "$_ver"; then + ## If empty, try date [fontforge] + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi + echo "$_ver" + #dnl +` + fi + num=` + echo "$ver" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + req=` + echo "4.11" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + { $as_echo "$as_me:$LINENO: result: $ver" >&5 +$as_echo "$ver" >&6; } + if test "$num" -lt "$req"; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 4.11 (installed: $ver)"\"`\" + + fi + vervar="`echo MAKEINFO | tr 'a-z' 'A-Z'`_VERSION" + eval `echo $vervar=$num` +## AC_SUBST(`eval echo $vervar`) + + fi + + + for ac_prog in texi2html +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_TEXI2HTML+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$TEXI2HTML"; then + ac_cv_prog_TEXI2HTML="$TEXI2HTML" # Let the user override the test. +else +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_prog_TEXI2HTML="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +TEXI2HTML=$ac_cv_prog_TEXI2HTML +if test -n "$TEXI2HTML"; then + { $as_echo "$as_me:$LINENO: result: $TEXI2HTML" >&5 +$as_echo "$TEXI2HTML" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$TEXI2HTML" && break +done +test -n "$TEXI2HTML" || TEXI2HTML="no" + + + + r="`eval echo '$'"TEXI2HTML"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"TEXI2HTML"`' : '.*\(echo\)' > /dev/null; then + true + else + ##STEPMAKE_WARN(cannot find . ) + false + fi + + if test $? -ne 0; then + + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"texi2html\"`\" + + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + command="echo ERROR: texi2html not found" + # abort configure process here? + else + command="- echo texi2html not found" + fi + eval "TEXI2HTML"='$command' + false + else + true + fi + + if test $? -eq 0 -a -n "1.82"; then + + r="`eval echo '$'"TEXI2HTML"`" + { $as_echo "$as_me:$LINENO: checking $r version" >&5 +$as_echo_n "checking $r version... " >&6; } + exe=` + ## which doesn't work in ash, if /usr/bin/which isn't installed + ## type -p doesn't work in ash + ## command -v doesn't work in zsh + ## command -v "$r" 2>&1 + ## this test should work in ash, bash, pdksh (ksh), zsh + type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' +` + if test -n ""; then + ver="" + else + ver=` + ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' + ## + ## ARG. + ## Workaround for broken Debian gcc version string: + ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) + ## + ## -V: Workaround for python + + #dnl + + ## Assume and hunt for dotted version multiplet. + ## use eval trickery, because we cannot use multi-level $() instead of `` + ## for compatibility reasons. + + ## grab the first version number in --version output. + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1 | + tr ' ' '\n' | + sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | + grep -E '(^| )[0-9][0-9]*\.[0-9]' | + head -n 1\`\" + + if test -z "$_ver"; then + ## If empty, try date [fontforge] + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi + echo "$_ver" + #dnl +` + fi + num=` + echo "$ver" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + req=` + echo "1.82" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + { $as_echo "$as_me:$LINENO: result: $ver" >&5 +$as_echo "$ver" >&6; } + if test "$num" -lt "$req"; then + + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= 1.82 (installed: $ver)"\"`\" + + fi + vervar="`echo TEXI2HTML | tr 'a-z' 'A-Z'`_VERSION" + eval `echo $vervar=$num` +## AC_SUBST(`eval echo $vervar`) + + fi + + + for ac_prog in dblatex do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GUILE+set}" = set; then +if test "${ac_cv_prog_DBLATEX+set}" = set; then $as_echo_n "(cached) " >&6 else - case $GUILE in - [\\/]* | ?:[\\/]*) - ac_cv_path_GUILE="$GUILE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$DBLATEX"; then + ac_cv_prog_DBLATEX="$DBLATEX" # Let the user override the test. +else +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_GUILE="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_DBLATEX="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -11985,25 +12893,51 @@ done done IFS=$as_save_IFS - ;; -esac fi -GUILE=$ac_cv_path_GUILE -if test -n "$GUILE"; then - { $as_echo "$as_me:$LINENO: result: $GUILE" >&5 -$as_echo "$GUILE" >&6; } +fi +DBLATEX=$ac_cv_prog_DBLATEX +if test -n "$DBLATEX"; then + { $as_echo "$as_me:$LINENO: result: $DBLATEX" >&5 +$as_echo "$DBLATEX" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$GUILE" && break + test -n "$DBLATEX" && break done +test -n "$DBLATEX" || DBLATEX="no" - if test -n ""; then - r="`eval echo '$'"GUILE"`" + + r="`eval echo '$'"DBLATEX"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"DBLATEX"`' : '.*\(echo\)' > /dev/null; then + true + else + ##STEPMAKE_WARN(cannot find . ) + false + fi + + if test $? -ne 0; then + + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"dblatex\"`\" + + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + command="echo ERROR: dblatex not found" + # abort configure process here? + else + command="- echo dblatex not found" + fi + eval "DBLATEX"='$command' + false + else + true + fi + + if test $? -eq 0 -a -n "0.1.4"; then + + r="`eval echo '$'"DBLATEX"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12060,7 +12994,7 @@ $as_echo_n "checking $r version... " >&6; } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` req=` - echo "" | awk -F. ' + echo "0.1.4" | awk -F. ' { if ($3) {three = $3} else {three = 0} @@ -12071,32 +13005,27 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= (installed: $ver)"\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= 0.1.4 (installed: $ver)"\"`\" fi - vervar="`echo GUILE | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo DBLATEX | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) - fi fi - -# perl for help2man. - - - for ac_prog in perl + for ac_prog in bibtex do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_PERL+set}" = set; then +if test "${ac_cv_prog_BIBTEX+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$PERL"; then - ac_cv_prog_PERL="$PERL" # Let the user override the test. + if test -n "$BIBTEX"; then + ac_cv_prog_BIBTEX="$BIBTEX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -12105,7 +13034,7 @@ do 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_prog_PERL="$ac_prog" + ac_cv_prog_BIBTEX="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12115,24 +13044,24 @@ IFS=$as_save_IFS fi fi -PERL=$ac_cv_prog_PERL -if test -n "$PERL"; then - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 -$as_echo "$PERL" >&6; } +BIBTEX=$ac_cv_prog_BIBTEX +if test -n "$BIBTEX"; then + { $as_echo "$as_me:$LINENO: result: $BIBTEX" >&5 +$as_echo "$BIBTEX" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$PERL" && break + test -n "$BIBTEX" && break done -test -n "$PERL" || PERL="no" +test -n "$BIBTEX" || BIBTEX="no" - r="`eval echo '$'"PERL"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"PERL"`' : '.*\(echo\)' > /dev/null; then + r="`eval echo '$'"BIBTEX"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"BIBTEX"`' : '.*\(echo\)' > /dev/null; then true else ##STEPMAKE_WARN(cannot find . ) @@ -12141,69 +13070,23 @@ test -n "$PERL" || PERL="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"perl\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"bibtex\"`\" - if test "OPTIONAL" = "REQUIRED"; then - command="echo ERROR: perl not found" + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + command="echo ERROR: bibtex not found" # abort configure process here? else - command="- echo perl not found" + command="- echo bibtex not found" fi - eval "PERL"='$command' + eval "BIBTEX"='$command' false else true fi - if test $? -eq 0; then - for ac_prog in perl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PERL="$PERL" # 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_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PERL=$ac_cv_path_PERL -if test -n "$PERL"; then - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 -$as_echo "$PERL" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$PERL" && break -done - - if test -n ""; then + if test $? -eq 0 -a -n ""; then - r="`eval echo '$'"PERL"`" + r="`eval echo '$'"BIBTEX"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12271,30 +13154,27 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= (installed: $ver)"\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi - vervar="`echo PERL | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo BIBTEX | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) - fi fi - - - for ac_prog in makeinfo + for ac_prog in pdflatex do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_MAKEINFO+set}" = set; then +if test "${ac_cv_prog_PDFLATEX+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$MAKEINFO"; then - ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. + if test -n "$PDFLATEX"; then + ac_cv_prog_PDFLATEX="$PDFLATEX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -12303,7 +13183,7 @@ do 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_prog_MAKEINFO="$ac_prog" + ac_cv_prog_PDFLATEX="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12313,24 +13193,24 @@ IFS=$as_save_IFS fi fi -MAKEINFO=$ac_cv_prog_MAKEINFO -if test -n "$MAKEINFO"; then - { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5 -$as_echo "$MAKEINFO" >&6; } +PDFLATEX=$ac_cv_prog_PDFLATEX +if test -n "$PDFLATEX"; then + { $as_echo "$as_me:$LINENO: result: $PDFLATEX" >&5 +$as_echo "$PDFLATEX" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$MAKEINFO" && break + test -n "$PDFLATEX" && break done -test -n "$MAKEINFO" || MAKEINFO="no" +test -n "$PDFLATEX" || PDFLATEX="no" - r="`eval echo '$'"MAKEINFO"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"MAKEINFO"`' : '.*\(echo\)' > /dev/null; then + r="`eval echo '$'"PDFLATEX"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"PDFLATEX"`' : '.*\(echo\)' > /dev/null; then true else ##STEPMAKE_WARN(cannot find . ) @@ -12339,23 +13219,23 @@ test -n "$MAKEINFO" || MAKEINFO="no" if test $? -ne 0; then - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"makeinfo\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"pdflatex\"`\" - if test "REQUIRED" = "REQUIRED"; then - command="echo ERROR: makeinfo not found" + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + command="echo ERROR: pdflatex not found" # abort configure process here? else - command="- echo makeinfo not found" + command="- echo pdflatex not found" fi - eval "MAKEINFO"='$command' + eval "PDFLATEX"='$command' false else true fi - if test $? -eq 0 -a -n "4.11"; then + if test $? -eq 0 -a -n ""; then - r="`eval echo '$'"MAKEINFO"`" + r="`eval echo '$'"PDFLATEX"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12412,7 +13292,7 @@ $as_echo_n "checking $r version... " >&6; } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` req=` - echo "4.11" | awk -F. ' + echo "" | awk -F. ' { if ($3) {three = $3} else {three = 0} @@ -12423,27 +13303,27 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 4.11 (installed: $ver)"\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi - vervar="`echo MAKEINFO | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo PDFLATEX | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) fi - for ac_prog in texi2html + for ac_prog in pdfetex pdftex etex do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_TEXI2HTML+set}" = set; then +if test "${ac_cv_prog_PDFTEX+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$TEXI2HTML"; then - ac_cv_prog_TEXI2HTML="$TEXI2HTML" # Let the user override the test. + if test -n "$PDFTEX"; then + ac_cv_prog_PDFTEX="$PDFTEX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -12452,7 +13332,7 @@ do 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_prog_TEXI2HTML="$ac_prog" + ac_cv_prog_PDFTEX="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12462,24 +13342,24 @@ IFS=$as_save_IFS fi fi -TEXI2HTML=$ac_cv_prog_TEXI2HTML -if test -n "$TEXI2HTML"; then - { $as_echo "$as_me:$LINENO: result: $TEXI2HTML" >&5 -$as_echo "$TEXI2HTML" >&6; } +PDFTEX=$ac_cv_prog_PDFTEX +if test -n "$PDFTEX"; then + { $as_echo "$as_me:$LINENO: result: $PDFTEX" >&5 +$as_echo "$PDFTEX" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$TEXI2HTML" && break + test -n "$PDFTEX" && break done -test -n "$TEXI2HTML" || TEXI2HTML="no" +test -n "$PDFTEX" || PDFTEX="no" - r="`eval echo '$'"TEXI2HTML"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"TEXI2HTML"`' : '.*\(echo\)' > /dev/null; then + r="`eval echo '$'"PDFTEX"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"PDFTEX"`' : '.*\(echo\)' > /dev/null; then true else ##STEPMAKE_WARN(cannot find . ) @@ -12488,23 +13368,23 @@ test -n "$TEXI2HTML" || TEXI2HTML="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"texi2html\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"pdfetex pdftex etex\"`\" - if test "OPTIONAL" = "REQUIRED"; then - command="echo ERROR: texi2html not found" + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + command="echo ERROR: pdfetex pdftex etex not found" # abort configure process here? else - command="- echo texi2html not found" + command="- echo pdfetex pdftex etex not found" fi - eval "TEXI2HTML"='$command' + eval "PDFTEX"='$command' false else true fi - if test $? -eq 0 -a -n "1.82"; then + if test $? -eq 0 -a -n ""; then - r="`eval echo '$'"TEXI2HTML"`" + r="`eval echo '$'"PDFTEX"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12561,7 +13441,7 @@ $as_echo_n "checking $r version... " >&6; } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` req=` - echo "1.82" | awk -F. ' + echo "" | awk -F. ' { if ($3) {three = $3} else {three = 0} @@ -12572,27 +13452,27 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= 1.82 (installed: $ver)"\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi - vervar="`echo TEXI2HTML | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo PDFTEX | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) fi - for ac_prog in dblatex + for ac_prog in texi2pdf do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DBLATEX+set}" = set; then +if test "${ac_cv_prog_TEXI2PDF+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$DBLATEX"; then - ac_cv_prog_DBLATEX="$DBLATEX" # Let the user override the test. + if test -n "$TEXI2PDF"; then + ac_cv_prog_TEXI2PDF="$TEXI2PDF" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -12601,7 +13481,7 @@ do 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_prog_DBLATEX="$ac_prog" + ac_cv_prog_TEXI2PDF="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12611,24 +13491,24 @@ IFS=$as_save_IFS fi fi -DBLATEX=$ac_cv_prog_DBLATEX -if test -n "$DBLATEX"; then - { $as_echo "$as_me:$LINENO: result: $DBLATEX" >&5 -$as_echo "$DBLATEX" >&6; } +TEXI2PDF=$ac_cv_prog_TEXI2PDF +if test -n "$TEXI2PDF"; then + { $as_echo "$as_me:$LINENO: result: $TEXI2PDF" >&5 +$as_echo "$TEXI2PDF" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$DBLATEX" && break + test -n "$TEXI2PDF" && break done -test -n "$DBLATEX" || DBLATEX="no" +test -n "$TEXI2PDF" || TEXI2PDF="no" - r="`eval echo '$'"DBLATEX"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"DBLATEX"`' : '.*\(echo\)' > /dev/null; then + r="`eval echo '$'"TEXI2PDF"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"TEXI2PDF"`' : '.*\(echo\)' > /dev/null; then true else ##STEPMAKE_WARN(cannot find . ) @@ -12637,23 +13517,23 @@ test -n "$DBLATEX" || DBLATEX="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"dblatex\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"texi2pdf\"`\" - if test "OPTIONAL" = "REQUIRED"; then - command="echo ERROR: dblatex not found" + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + command="echo ERROR: texi2pdf not found" # abort configure process here? else - command="- echo dblatex not found" + command="- echo texi2pdf not found" fi - eval "DBLATEX"='$command' + eval "TEXI2PDF"='$command' false else true fi - if test $? -eq 0 -a -n "0.1.4"; then + if test $? -eq 0 -a -n ""; then - r="`eval echo '$'"DBLATEX"`" + r="`eval echo '$'"TEXI2PDF"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12710,7 +13590,7 @@ $as_echo_n "checking $r version... " >&6; } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` req=` - echo "0.1.4" | awk -F. ' + echo "" | awk -F. ' { if ($3) {three = $3} else {three = 0} @@ -12721,27 +13601,27 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= 0.1.4 (installed: $ver)"\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi - vervar="`echo DBLATEX | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo TEXI2PDF | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) fi - for ac_prog in pdflatex + for ac_prog in texindex do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_PDFLATEX+set}" = set; then +if test "${ac_cv_prog_TEXINDEX+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$PDFLATEX"; then - ac_cv_prog_PDFLATEX="$PDFLATEX" # Let the user override the test. + if test -n "$TEXINDEX"; then + ac_cv_prog_TEXINDEX="$TEXINDEX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -12750,7 +13630,7 @@ do 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_prog_PDFLATEX="$ac_prog" + ac_cv_prog_TEXINDEX="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12760,24 +13640,24 @@ IFS=$as_save_IFS fi fi -PDFLATEX=$ac_cv_prog_PDFLATEX -if test -n "$PDFLATEX"; then - { $as_echo "$as_me:$LINENO: result: $PDFLATEX" >&5 -$as_echo "$PDFLATEX" >&6; } +TEXINDEX=$ac_cv_prog_TEXINDEX +if test -n "$TEXINDEX"; then + { $as_echo "$as_me:$LINENO: result: $TEXINDEX" >&5 +$as_echo "$TEXINDEX" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$PDFLATEX" && break + test -n "$TEXINDEX" && break done -test -n "$PDFLATEX" || PDFLATEX="no" +test -n "$TEXINDEX" || TEXINDEX="no" - r="`eval echo '$'"PDFLATEX"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"PDFLATEX"`' : '.*\(echo\)' > /dev/null; then + r="`eval echo '$'"TEXINDEX"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"TEXINDEX"`' : '.*\(echo\)' > /dev/null; then true else ##STEPMAKE_WARN(cannot find . ) @@ -12786,15 +13666,15 @@ test -n "$PDFLATEX" || PDFLATEX="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"pdflatex\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"texindex\"`\" - if test "OPTIONAL" = "REQUIRED"; then - command="echo ERROR: pdflatex not found" + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + command="echo ERROR: texindex not found" # abort configure process here? else - command="- echo pdflatex not found" + command="- echo texindex not found" fi - eval "PDFLATEX"='$command' + eval "TEXINDEX"='$command' false else true @@ -12802,7 +13682,7 @@ test -n "$PDFLATEX" || PDFLATEX="no" if test $? -eq 0 -a -n ""; then - r="`eval echo '$'"PDFLATEX"`" + r="`eval echo '$'"TEXINDEX"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12870,15 +13750,41 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= (installed: $ver)"\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi - vervar="`echo PDFLATEX | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo TEXINDEX | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) fi +{ $as_echo "$as_me:$LINENO: checking for epsf.tex" >&5 +$as_echo_n "checking for epsf.tex... " >&6; } +TEX_EPSF=`kpsewhich tex epsf` +if test "$TEX_EPSF" = ""; then + { $as_echo "$as_me:$LINENO: result: not found" >&5 +$as_echo "not found" >&6; } + + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"epsf.tex\"`\" + +else + { $as_echo "$as_me:$LINENO: result: $TEX_EPSF" >&5 +$as_echo "$TEX_EPSF" >&6; } +fi +{ $as_echo "$as_me:$LINENO: checking for Cyrillic characters support in TeX" >&5 +$as_echo_n "checking for Cyrillic characters support in TeX... " >&6; } +TEX_FIKPARM=`kpsewhich -format=mf fikparm` +if test "$TEX_FIKPARM" = ""; then + { $as_echo "$as_me:$LINENO: result: not found" >&5 +$as_echo "not found" >&6; } + + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"'lh CTAN package (texlive-lang-cyrillic or texlive-texmf-fonts)'\"`\" + +else + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +fi for ac_prog in pngtopnm do @@ -12935,9 +13841,9 @@ test -n "$NETPBM" || NETPBM="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"pngtopnm\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"pngtopnm\"`\" - if test "OPTIONAL" = "REQUIRED"; then + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then command="echo ERROR: pngtopnm not found" # abort configure process here? else @@ -13019,7 +13925,7 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= (installed: $ver)"\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi vervar="`echo NETPBM | tr 'a-z' 'A-Z'`_VERSION" @@ -13084,9 +13990,9 @@ test -n "$IMAGEMAGICK" || IMAGEMAGICK="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"convert\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"convert\"`\" - if test "OPTIONAL" = "REQUIRED"; then + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then command="echo ERROR: convert not found" # abort configure process here? else @@ -13168,7 +14074,7 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= (installed: $ver)"\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi vervar="`echo IMAGEMAGICK | tr 'a-z' 'A-Z'`_VERSION" @@ -13234,9 +14140,9 @@ test -n "$ZIPDOC" || ZIPDOC="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"zip\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"zip\"`\" - if test "OPTIONAL" = "REQUIRED"; then + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then command="echo ERROR: zip not found" # abort configure process here? else @@ -13318,7 +14224,7 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= (installed: $ver)"\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi vervar="`echo ZIPDOC | tr 'a-z' 'A-Z'`_VERSION" @@ -13383,9 +14289,9 @@ test -n "$RSYNC" || RSYNC="no" if test $? -ne 0; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"rsync\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"rsync\"`\" - if test "OPTIONAL" = "REQUIRED"; then + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then command="echo ERROR: rsync not found" # abort configure process here? else @@ -13467,7 +14373,7 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= (installed: $ver)"\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi vervar="`echo RSYNC | tr 'a-z' 'A-Z'`_VERSION" @@ -13477,7 +14383,6 @@ $as_echo "$ver" >&6; } fi - cat >>confdefs.h <<_ACEOF #define FLOWER_VERSION "${FULL_FLOWER_VERSION}" _ACEOF @@ -14763,7 +15668,7 @@ fi if test -n "$OPTIONAL"; then echo - echo "WARNING: Please consider installing optional programs: $OPTIONAL" + echo "WARNING: Please consider installing optional programs or files: $OPTIONAL" fi if test -n "$REQUIRED"; then