X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure;h=a779d129943badbc493d2f48766d11da65f2224a;hb=91020f65ff553c2ece26991adaad7d3ea3e7a5fa;hp=33dec6d88fc265a7f719a2be19585134b5d553f0;hpb=0ac07f31e0f95fc18e5916ce756b9c746af7cc58;p=lilypond.git diff --git a/configure b/configure index 33dec6d88f..a779d12994 100755 --- a/configure +++ b/configure @@ -651,6 +651,9 @@ BIBTEX DBLATEX TEXI2HTML MAKEINFO +USE_EXTRACTPDFMARK +EXTRACTPDFMARK +GS920 GHOSTSCRIPT PERL GUILE @@ -667,6 +670,8 @@ PKG_CONFIG LIBOBJS T1ASM FONTFORGE +PYTHON_LDFLAGS +PYTHON_CFLAGS PYTHON_CONFIG CXXABI_LIBS GUILE_LDFLAGS @@ -690,8 +695,10 @@ CXXCPP ac_ct_CXX CXXFLAGS CXX -NCSB_DIR -NCSB_SOURCE_FILES +URWOTF_FILES +URWOTF_DIR +TEXGYRE_FILES +TEXGYRE_DIR FCLIST EXTRA_LIBS DEFINES @@ -786,11 +793,14 @@ ac_user_opts=' enable_option_checking enable_config enable_documentation -with_ncsb_dir +enable_guile2 +with_texgyre_dir +with_urwotf_dir enable_relocation enable_rpath enable_static_gxx enable_debugging +enable_checking enable_optimising enable_profiling enable_pipe @@ -1439,10 +1449,12 @@ Optional Features: --enable-config=CONF put settings in config-CONF.make and config-CONF.h; do `make conf=CONF' to get output in ./out-CONF --enable-documentation build Documentation. Default: on + --enable-guile2 highly experimental GUILE 2 support. Default: off --enable-relocation compile with dynamic relocation. Default: off --enable-rpath hardcode runtime library path. Default: off --enable-static-gxx link libstdc++.a statically. Default: off --enable-debugging compile with debugging info. Default: on + --enable-checking compile with expensive run-time checks. Default: off --enable-optimising compile with optimising. Default: on --enable-profiling compile with gprof support. Default: off --enable-pipe compile with -pipe. Default: on @@ -1450,7 +1462,8 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-ncsb-dir=DIR location of Century Schoolbook fonts. + --with-texgyre-dir=DIR location of TeX Gyre fonts. + --with-urwotf-dir=DIR location of URW++ OTF fonts. --with-localedir=DIR location of locales. Default: PREFIX/share/locale --with-lang=LANG use LANG as language to emit messages --with-python-include=DIR @@ -2295,7 +2308,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -2444,7 +2458,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -2594,7 +2609,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -2851,7 +2867,8 @@ $as_echo_n "checking for python... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -3055,12 +3072,28 @@ fi +GUILEv2=no +# Check whether --enable-guile2 was given. +if test "${enable_guile2+set}" = set; then + enableval=$enable_guile2; GUILEv2=$enableval +fi + + + +# Check whether --with-texgyre-dir was given. +if test "${with_texgyre_dir+set}" = set; then + withval=$with_texgyre_dir; TEXGYRE_DIR=$withval +else + TEXGYRE_DIR="" +fi + + -# Check whether --with-ncsb-dir was given. -if test "${with_ncsb_dir+set}" = set; then - withval=$with_ncsb_dir; NCSB_DIR=$withval +# Check whether --with-urwotf-dir was given. +if test "${with_urwotf_dir+set}" = set; then + withval=$with_urwotf_dir; URWOTF_DIR=$withval else - NCSB_DIR="" + URWOTF_DIR="" fi @@ -3093,6 +3126,7 @@ fi CXXFLAGS=${CXXFLAGS-$CFLAGS} LDFLAGS=${LDFLAGS-""} optimise_b=yes + checks_b=no profile_b=no debug_b=yes pipe_b=yes @@ -3103,6 +3137,12 @@ if test "${enable_debugging+set}" = set; then fi + # Check whether --enable-checking was given. +if test "${enable_checking+set}" = set; then + enableval=$enable_checking; checks_b=$enableval +fi + + # Check whether --enable-optimising was given. if test "${enable_optimising+set}" = set; then enableval=$enable_optimising; optimise_b=$enableval @@ -3122,12 +3162,17 @@ fi if test "$optimise_b" = yes; then - cat >>confdefs.h <<\_ACEOF -#define NDEBUG 1 -_ACEOF - - DEFINES="$DEFINES -DNDEBUG" OPTIMIZE=" -O2 -finline-functions" + # following two lines are compatibility while Patchy has not + # yet learnt about --enable-checking. But once it has, we + # don't want -DDEBUG twice, so we omit it here if it is going + # to get added anyway later. + elif test "$checks_b" != yes; then + DEFINES="$DEFINES -DDEBUG" + fi + + if test "$checks_b" = yes; then + DEFINES="$DEFINES -DDEBUG" fi if test $profile_b = yes; then @@ -4230,23 +4275,22 @@ $as_echo "no" >&6; } fi -{ $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: checking for TeX Gyre fonts OTF files" >&5 +$as_echo_n "checking for TeX Gyre fonts OTF files... " >&6; } -if test "$NCSB_DIR" = ""; then +if test "$TEXGYRE_DIR" = ""; then if test "$FCLIST" != ""; then - 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` - NCSB_DIR=`$as_dirname -- $NCSB_FILE || -$as_expr X$NCSB_FILE : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$NCSB_FILE : 'X\(//\)[^/]' \| \ - X$NCSB_FILE : 'X\(//\)$' \| \ - X$NCSB_FILE : 'X\(/\)' \| . 2>/dev/null || -$as_echo X$NCSB_FILE | + TEXGYRE_FILE=`$FCLIST "TeX Gyre Schola:fontformat=CFF" file | head -n 1` + if test "$TEXGYRE_FILE" != ""; then + TEXGYRE_FILE=`echo $TEXGYRE_FILE | sed 's/\(:.*\)$//g'` + TEXGYRE_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $TEXGYRE_FILE` + TEXGYRE_DIR=`$as_dirname -- $TEXGYRE_FILE || +$as_expr X$TEXGYRE_FILE : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$TEXGYRE_FILE : 'X\(//\)[^/]' \| \ + X$TEXGYRE_FILE : 'X\(//\)$' \| \ + X$TEXGYRE_FILE : 'X\(/\)' \| . 2>/dev/null || +$as_echo X$TEXGYRE_FILE | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -4267,44 +4311,114 @@ $as_echo X$NCSB_FILE | fi fi fi -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" +if test "$TEXGYRE_DIR" != "" ; then + for f in texgyreschola-regular.otf texgyreschola-italic.otf \ + texgyreschola-bold.otf texgyreschola-bolditalic.otf \ + texgyreheros-regular.otf texgyreheros-italic.otf \ + texgyreheros-bold.otf texgyreheros-bolditalic.otf \ + texgyrecursor-regular.otf texgyrecursor-italic.otf \ + texgyrecursor-bold.otf texgyrecursor-bolditalic.otf; do + if test ! -f "$TEXGYRE_DIR/$f"; then + MISSING_TEXGYRE_FILES="$MISSING_TEXGYRE_FILES $f" 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 + TEXGYRE_FILES="$TEXGYRE_FILES $f" fi done fi -if test "$NCSB_DIR" = "" -o "$MISSING_NCSB_SOURCE_FILES" != "$INCOMPLETE_NCSB_SOURCE_FILES"; then +if test "$TEXGYRE_DIR" = "" -o "$MISSING_TEXGYRE_FILES" != ""; then { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"International New Century Schoolbook fonts\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"TeX Gyre fonts OTF\"`\" - if test "$NCSB_DIR" = ""; then + if test "$TEXGYRE_DIR" = ""; then if test "$FCLIST" = ""; then - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'(install the fc-list utility from FontConfig, or use --with-ncsb-dir)'\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'(install the fc-list utility from FontConfig, or use --with-texgyre-dir)'\"`\" else - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'(make sure the fc-list utility can see them, or use --with-ncsb-dir)'\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""(make sure the fc-list utility can see them, e.g. 'sudo apt-get install fonts-texgyre', or use --with-texgyre-dir)"\"`\" fi + else + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'(these files are missing: $MISSING_TEXGYRE_FILES)'\"`\" + fi - if test "$MISSING_NCSB_SOURCE_FILES" != ""; then +else + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:$LINENO: checking for URW++ OTF files" >&5 +$as_echo_n "checking for URW++ OTF files... " >&6; } - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'(these files are missing: $MISSING_NCSB_SOURCE_FILES)'\"`\" +if test "$URWOTF_DIR" = ""; then + if test "$FCLIST" != ""; then + URWOTF_FILE=`$FCLIST "C059:fontformat=CFF" file | head -n 1` + if test "$URWOTF_FILE" != ""; then + URWOTF_FILE=`echo $URWOTF_FILE | sed 's/\(:.*\)$//g'` + URWOTF_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $URWOTF_FILE` + URWOTF_DIR=`$as_dirname -- $URWOTF_FILE || +$as_expr X$URWOTF_FILE : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$URWOTF_FILE : 'X\(//\)[^/]' \| \ + X$URWOTF_FILE : 'X\(//\)$' \| \ + X$URWOTF_FILE : 'X\(/\)' \| . 2>/dev/null || +$as_echo X$URWOTF_FILE | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + fi fi - if test "$INCOMPLETE_NCSB_SOURCE_FILES" != ""; then +fi +if test "$URWOTF_DIR" != "" ; then + for f in C059-BdIta.otf C059-Bold.otf \ + C059-Italic.otf C059-Roman.otf \ + NimbusMonoPS-Bold.otf NimbusMonoPS-BoldItalic.otf \ + NimbusMonoPS-Italic.otf NimbusMonoPS-Regular.otf \ + NimbusSans-Bold.otf NimbusSans-BoldOblique.otf \ + NimbusSans-Oblique.otf NimbusSans-Regular.otf; do + if test ! -f "$URWOTF_DIR/$f"; then + MISSING_URWOTF_FILES="$MISSING_URWOTF_FILES $f" + else + URWOTF_FILES="$URWOTF_FILES $f" + fi + done +fi +if test "$URWOTF_DIR" = "" -o "$MISSING_URWOTF_FILES" != ""; then + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"URW++ OTF fonts\"`\" + + if test "$URWOTF_DIR" = ""; then + if test "$FCLIST" = ""; then + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"'(install the fc-list utility from FontConfig, or use --with-urwotf-dir)'\"`\" + + else + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""(download OTF files from 'http://git.ghostscript.com/?p=urw-core35-fonts.git;a=commit;h=79bcdfb34fbce12b592cce389fa7a19da6b5b018' and put them under '~/.local/share/fonts' etc., or use --with-urwotf-dir)"\"`\" + + fi + else - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'(these files do not contain Cyrillic characters: $INCOMPLETE_NCSB_SOURCE_FILES)'\"`\" + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"'(these files are missing: $MISSING_URWOTF_FILES)'\"`\" fi else @@ -4362,7 +4476,8 @@ $as_echo_n "checking for python... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -5271,7 +5386,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -5717,8 +5833,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGS $OPTIMIZE" - LD='$(CXX)' - @@ -5788,7 +5902,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -6094,7 +6209,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -6588,7 +6704,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -6669,7 +6786,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -6826,7 +6944,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -7707,7 +7826,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -7858,7 +7978,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -8007,7 +8128,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -8071,7 +8193,8 @@ $as_echo "$ver" >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$METAPOST" --version || "$METAPOST" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$METAPOST" --version || "$METAPOST" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -8223,7 +8346,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -8277,6 +8401,8 @@ $as_echo "no" >&6; } $as_echo "yes" >&6; } fi +if test "$GUILEv2" = "yes" +then ## First, let's just see if we can find Guile at all. test -n "$target_alias" && target_guile_config=$target_alias-guile-config @@ -8323,7 +8449,8 @@ $as_echo_n "checking for guile-config... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -8339,7 +8466,7 @@ $as_echo_n "checking for guile-config... " >&6; } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` req=` - echo "1.8.2" | awk -F. ' + echo "2.0.7" | awk -F. ' { if ($3) {three = $3} else {three = 0} @@ -8347,19 +8474,19 @@ $as_echo_n "checking for guile-config... " >&6; } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` sup=` - echo "1.9.0" | awk -F. ' + echo "2.2.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)" + if test -n "2.0.7" -a "$num" -lt "$req"; then + guile_config="$r >= 2.0.7 (installed: $ver)" continue else - if test -n "1.9.0" -a "$num" -ge "$sup"; then - guile_config="$r < 1.9.0 (installed: $ver)" + if test -n "2.2.0" -a "$num" -ge "$sup"; then + guile_config="$r < 2.2.0 (installed: $ver)" continue else guile_config=$r @@ -8378,7 +8505,7 @@ $as_echo "$ver" >&6; } GUILE_CONFIG=$found else - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$guile_config (guile-devel, guile-dev or libguile-dev package) or guile1-config (guile1-devel package)"\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$guile_config (guile-devel, guile-dev or libguile-dev package)"\"`\" fi @@ -8764,32 +8891,175 @@ _ACEOF _ACEOF +else -# check for 3 typedefs added in Guile 1.9 -save_CXXFLAGS="$CXXFLAGS" -CXXFLAGS="$GUILE_CFLAGS $CXXFLAGS" -{ $as_echo "$as_me:$LINENO: checking for scm_t_hash_fold_fn" >&5 -$as_echo_n "checking for scm_t_hash_fold_fn... " >&6; } -if test "${ac_cv_type_scm_t_hash_fold_fn+set}" = set; then + ## 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 + ## 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 + + #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-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ + | 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" -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; } + GUILE_CONFIG=$found + else + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$guile_config (guile-devel, guile-dev or libguile-dev package)"\"`\" + + fi + + + + guile_version="$ver" + #dnl + GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'` + GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'` + GUILE_PATCH_LEVEL=`expr $guile_version : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + #dnl + + 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 "$guile_config" 2>&1 + ## this test should work in ash, bash, pdksh (ksh), zsh + type -p $guile_config 2>/dev/null | tail -n 1 | awk '{print $NF}' +` + if test -x $exe; then + { $as_echo "$as_me:$LINENO: checking guile compile flags" >&5 +$as_echo_n "checking guile compile flags... " >&6; } + GUILE_CFLAGS="`$guile_config compile`" + { $as_echo "$as_me:$LINENO: result: $GUILE_CFLAGS" >&5 +$as_echo "$GUILE_CFLAGS" >&6; } + { $as_echo "$as_me:$LINENO: checking guile link flags" >&5 +$as_echo_n "checking guile link flags... " >&6; } + GUILE_LDFLAGS="`$guile_config link`" + { $as_echo "$as_me:$LINENO: result: $GUILE_LDFLAGS" >&5 +$as_echo "$GUILE_LDFLAGS" >&6; } + fi + + + + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS" + LIBS="$GUILE_LDFLAGS $LIBS" + +for ac_header in libguile.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - ac_cv_type_scm_t_hash_fold_fn=no + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - -int -main () -{ -if (sizeof (scm_t_hash_fold_fn)) - return 0; - ; - return 0; -} +$ac_includes_default +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -8809,104 +9079,146 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -int -main () -{ -if (sizeof ((scm_t_hash_fold_fn))) - return 0; - ; - return 0; -} + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : + }; then + ac_header_preproc=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_scm_t_hash_fold_fn=yes + ac_header_preproc=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_scm_t_hash_fold_fn" >&5 -$as_echo "$ac_cv_type_scm_t_hash_fold_fn" >&6; } -if test "x$ac_cv_type_scm_t_hash_fold_fn" = x""yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_SCM_T_HASH_FOLD_FN 1 -_ACEOF +done -cat >>confdefs.h <<\_ACEOF -#define HAVE_GUILE_HASH_FUNC 1 -_ACEOF -fi -{ $as_echo "$as_me:$LINENO: checking for scm_t_hash_handle_fn" >&5 -$as_echo_n "checking for scm_t_hash_handle_fn... " >&6; } -if test "${ac_cv_type_scm_t_hash_handle_fn+set}" = set; then +{ $as_echo "$as_me:$LINENO: checking for scm_boot_guile in -lguile" >&5 +$as_echo_n "checking for scm_boot_guile in -lguile... " >&6; } +if test "${ac_cv_lib_guile_scm_boot_guile+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_cv_type_scm_t_hash_handle_fn=no + ac_check_lib_save_LIBS=$LIBS +LIBS="-lguile $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char scm_boot_guile (); int main () { -if (sizeof (scm_t_hash_handle_fn)) - return 0; +return scm_boot_guile (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -8915,33 +9227,97 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_guile_scm_boot_guile=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_guile_scm_boot_guile=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_guile_scm_boot_guile" >&5 +$as_echo "$ac_cv_lib_guile_scm_boot_guile" >&6; } +if test "x$ac_cv_lib_guile_scm_boot_guile" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBGUILE 1 +_ACEOF + + LIBS="-lguile $LIBS" + +fi + + +for ac_func in scm_boot_guile +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif int main () { -if (sizeof ((scm_t_hash_handle_fn))) - return 0; +return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -8950,35 +9326,276 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_scm_t_hash_handle_fn=yes + eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + libguile_b=no +fi +done + if test "$libguile_b" = "no"; then + warn='libguile (libguile-dev, guile-devel or guile-dev + package).' -fi + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$warn\"`\" -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_scm_t_hash_handle_fn" >&5 -$as_echo "$ac_cv_type_scm_t_hash_handle_fn" >&6; } -if test "x$ac_cv_type_scm_t_hash_handle_fn" = x""yes; then + fi + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + cat >>confdefs.h <<_ACEOF +#define GUILE_MAJOR_VERSION $GUILE_MAJOR_VERSION +_ACEOF -cat >>confdefs.h <<_ACEOF -#define HAVE_SCM_T_HASH_HANDLE_FN 1 + cat >>confdefs.h <<_ACEOF +#define GUILE_MINOR_VERSION $GUILE_MINOR_VERSION _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_GUILE_HASH_FUNC 1 + cat >>confdefs.h <<_ACEOF +#define GUILE_PATCH_LEVEL $GUILE_PATCH_LEVEL +_ACEOF + + +fi + +# check for 3 typedefs added in Guile 1.9 +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$GUILE_CFLAGS $CXXFLAGS" +{ $as_echo "$as_me:$LINENO: checking for scm_t_hash_fold_fn" >&5 +$as_echo_n "checking for scm_t_hash_fold_fn... " >&6; } +if test "${ac_cv_type_scm_t_hash_fold_fn+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_scm_t_hash_fold_fn=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +if (sizeof (scm_t_hash_fold_fn)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +if (sizeof ((scm_t_hash_fold_fn))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_scm_t_hash_fold_fn=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_scm_t_hash_fold_fn" >&5 +$as_echo "$ac_cv_type_scm_t_hash_fold_fn" >&6; } +if test "x$ac_cv_type_scm_t_hash_fold_fn" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_SCM_T_HASH_FOLD_FN 1 +_ACEOF + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GUILE_HASH_FUNC 1 +_ACEOF + +fi +{ $as_echo "$as_me:$LINENO: checking for scm_t_hash_handle_fn" >&5 +$as_echo_n "checking for scm_t_hash_handle_fn... " >&6; } +if test "${ac_cv_type_scm_t_hash_handle_fn+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_scm_t_hash_handle_fn=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +if (sizeof (scm_t_hash_handle_fn)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +if (sizeof ((scm_t_hash_handle_fn))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_scm_t_hash_handle_fn=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_scm_t_hash_handle_fn" >&5 +$as_echo "$ac_cv_type_scm_t_hash_handle_fn" >&6; } +if test "x$ac_cv_type_scm_t_hash_handle_fn" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_SCM_T_HASH_HANDLE_FN 1 +_ACEOF + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GUILE_HASH_FUNC 1 _ACEOF fi @@ -9329,7 +9946,8 @@ $as_echo_n "checking for python... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -9653,6 +10271,8 @@ done + + for ac_prog in fontforge do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -9810,7 +10430,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -10007,7 +10628,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -10921,7 +11543,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -11781,9 +12404,512 @@ test -n "$WINDRES" || WINDRES="no" true fi - if test $? -eq 0 -a -n ""; then + if test $? -eq 0 -a -n ""; then + + r="`eval echo '$'"WINDRES"`" + { $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-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ + | 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 "x"=\"`eval echo \"'$'x\" \""$r >= (installed: $ver)"\"`\" + + fi + vervar="`echo WINDRES | tr 'a-z' 'A-Z'`_VERSION" + eval `echo $vervar=$num` +## AC_SUBST(`eval echo $vervar`) + + fi + + + + +# 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 + + #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-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ + | 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" + + + + r="`eval echo '$'"GUILE"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"GUILE"`' : '.*\(echo\)' > /dev/null; then + true + else + ##STEPMAKE_WARN(cannot find . ) + false + fi + + if test $? -ne 0; then + + eval ""=\"`eval echo \"'$'\" \"$GUILE\"`\" + + if test "" = "REQUIRED"; then + command="echo ERROR: $GUILE not found" + # abort configure process here? + else + command="- echo $GUILE not found" + fi + eval "GUILE"='$command' + false + else + true + fi + + 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-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ + | 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 '$'"WINDRES"`" + r="`eval echo '$'"PERL"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -11823,7 +12949,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -11851,132 +12978,37 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "x"=\"`eval echo \"'$'x\" \""$r >= (installed: $ver)"\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi - vervar="`echo WINDRES | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo PERL | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) - fi - - - - -# 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 - - #dnl - - ## Assume and hunt for dotted version multiplet. - ## use eval trickery, because we cannot use multi-level $() instead of `` - ## for compatibility reasons. + fi - ## 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 "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\"`\" +## Optional tools for building documentation, website, extra fonts. +if test "$DOCUMENTATION" = "yes"; then + DOCUMENTATION_REQUIRED=REQUIRED +else + DOCUMENTATION_REQUIRED=OPTIONAL +fi - fi - for ac_prog in $GUILE + 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_GUILE+set}" = set; then +if test "${ac_cv_prog_GHOSTSCRIPT+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. + 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 @@ -11985,7 +13017,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_GUILE="$ac_prog" + ac_cv_prog_GHOSTSCRIPT="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -11995,24 +13027,24 @@ 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; } +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 "$GUILE" && break + test -n "$GHOSTSCRIPT" && break done -test -n "$GUILE" || GUILE="no" +test -n "$GHOSTSCRIPT" || GHOSTSCRIPT="no" - r="`eval echo '$'"GUILE"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"GUILE"`' : '.*\(echo\)' > /dev/null; then + 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 . ) @@ -12021,33 +13053,33 @@ test -n "$GUILE" || GUILE="no" if test $? -ne 0; then - eval ""=\"`eval echo \"'$'\" \"$GUILE\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"gs\"`\" - if test "" = "REQUIRED"; then - command="echo ERROR: $GUILE not found" + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + command="echo ERROR: gs not found" # abort configure process here? else - command="- echo $GUILE not found" + command="- echo gs not found" fi - eval "GUILE"='$command' + eval "GHOSTSCRIPT"='$command' false else true fi if test $? -eq 0; then - for ac_prog in $GUILE + 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_GUILE+set}" = set; then +if test "${ac_cv_path_GHOSTSCRIPT+set}" = set; then $as_echo_n "(cached) " >&6 else - case $GUILE in + case $GHOSTSCRIPT in [\\/]* | ?:[\\/]*) - ac_cv_path_GUILE="$GUILE" # Let the user override the test with a path. + ac_cv_path_GHOSTSCRIPT="$GHOSTSCRIPT" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12057,7 +13089,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_GUILE="$as_dir/$ac_word$ac_exec_ext" + 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 @@ -12068,22 +13100,22 @@ 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; } +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 "$GUILE" && break + test -n "$GHOSTSCRIPT" && break done - if test -n ""; then + if test -n "8.60"; then - r="`eval echo '$'"GUILE"`" + r="`eval echo '$'"GHOSTSCRIPT"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12123,7 +13155,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -12140,7 +13173,7 @@ $as_echo_n "checking $r version... " >&6; } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` req=` - echo "" | awk -F. ' + echo "8.60" | awk -F. ' { if ($3) {three = $3} else {three = 0} @@ -12151,10 +13184,10 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval ""=\"`eval echo \"'$'\" \""$r >= (installed: $ver)"\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= 8.60 (installed: $ver)"\"`\" fi - vervar="`echo GUILE | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo GHOSTSCRIPT | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) @@ -12163,20 +13196,20 @@ $as_echo "$ver" >&6; } -# perl for help2man and for mf2pt1.pl - for ac_prog in perl + + 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_PERL+set}" = set; then +if test "${ac_cv_prog_GS920+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 "$GS920"; then + ac_cv_prog_GS920="$GS920" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -12185,7 +13218,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_GS920="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12195,24 +13228,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; } +GS920=$ac_cv_prog_GS920 +if test -n "$GS920"; then + { $as_echo "$as_me:$LINENO: result: $GS920" >&5 +$as_echo "$GS920" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$PERL" && break + test -n "$GS920" && break done -test -n "$PERL" || PERL="no" +test -n "$GS920" || GS920="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 '$'"GS920"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"GS920"`' : '.*\(echo\)' > /dev/null; then true else ##STEPMAKE_WARN(cannot find . ) @@ -12221,69 +13254,23 @@ test -n "$PERL" || PERL="no" if test $? -ne 0; then - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"perl\"`\" + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"gs\"`\" - if test "REQUIRED" = "REQUIRED"; then - command="echo ERROR: perl not found" + if test "OPTIONAL" = "REQUIRED"; then + command="echo ERROR: gs 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 + else + command="- echo gs not found" + fi + eval "GS920"='$command' + false + else + true + fi - if test -n ""; then + if test $? -eq 0 -a -n "9.20"; then - r="`eval echo '$'"PERL"`" + r="`eval echo '$'"GS920"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12323,7 +13310,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -12340,7 +13328,7 @@ $as_echo_n "checking $r version... " >&6; } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` req=` - echo "" | awk -F. ' + echo "9.20" | awk -F. ' { if ($3) {three = $3} else {three = 0} @@ -12351,37 +13339,27 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= (installed: $ver)"\"`\" + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= 9.20 (installed: $ver)"\"`\" fi - vervar="`echo PERL | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo GS920 | 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 + for ac_prog in extractpdfmark 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_EXTRACTPDFMARK+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 "$EXTRACTPDFMARK"; then + ac_cv_prog_EXTRACTPDFMARK="$EXTRACTPDFMARK" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -12390,7 +13368,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_EXTRACTPDFMARK="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12400,24 +13378,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; } +EXTRACTPDFMARK=$ac_cv_prog_EXTRACTPDFMARK +if test -n "$EXTRACTPDFMARK"; then + { $as_echo "$as_me:$LINENO: result: $EXTRACTPDFMARK" >&5 +$as_echo "$EXTRACTPDFMARK" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$GHOSTSCRIPT" && break + test -n "$EXTRACTPDFMARK" && break done -test -n "$GHOSTSCRIPT" || GHOSTSCRIPT="no" +test -n "$EXTRACTPDFMARK" || EXTRACTPDFMARK="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 '$'"EXTRACTPDFMARK"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"EXTRACTPDFMARK"`' : '.*\(echo\)' > /dev/null; then true else ##STEPMAKE_WARN(cannot find . ) @@ -12426,69 +13404,23 @@ test -n "$GHOSTSCRIPT" || GHOSTSCRIPT="no" if test $? -ne 0; then - eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"gs\"`\" + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"extractpdfmark\"`\" - if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then - command="echo ERROR: gs not found" + if test "OPTIONAL" = "REQUIRED"; then + command="echo ERROR: extractpdfmark not found" # abort configure process here? else - command="- echo gs not found" + command="- echo extractpdfmark not found" fi - eval "GHOSTSCRIPT"='$command' + eval "EXTRACTPDFMARK"='$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 + if test $? -eq 0 -a -n ""; then - r="`eval echo '$'"GHOSTSCRIPT"`" + r="`eval echo '$'"EXTRACTPDFMARK"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12528,7 +13460,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -12545,7 +13478,7 @@ $as_echo_n "checking $r version... " >&6; } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` req=` - echo "8.60" | awk -F. ' + echo "" | awk -F. ' { if ($3) {three = $3} else {three = 0} @@ -12556,16 +13489,43 @@ $as_echo_n "checking $r version... " >&6; } $as_echo "$ver" >&6; } if test "$num" -lt "$req"; then - eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= 8.60 (installed: $ver)"\"`\" + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= (installed: $ver)"\"`\" fi - vervar="`echo GHOSTSCRIPT | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo EXTRACTPDFMARK | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) - fi fi +req=` + echo "9.20" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` +USE_EXTRACTPDFMARK=yes +if test "$GS920_VERSION" -lt "$req"; then + GS920= + USE_EXTRACTPDFMARK=no +fi +if test "$EXTRACTPDFMARK" != "extractpdfmark"; then + EXTRACTPDFMARK= + USE_EXTRACTPDFMARK=no +fi +if test "$USE_EXTRACTPDFMARK" != "yes"; then + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""(Optionally using Ghostscript >= 9.20 together with"\"`\" + + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"" Extract PDFmark can significantly reduce the disk space required"\"`\" + + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"" for building the documentation and the final PDF files.)"\"`\" + +fi for ac_prog in makeinfo @@ -12679,7 +13639,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -12828,7 +13789,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -12977,7 +13939,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -13126,7 +14089,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -13164,7 +14128,7 @@ $as_echo "$ver" >&6; } fi - for ac_prog in pdflatex + for ac_prog in xelatex 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 @@ -13219,13 +14183,13 @@ test -n "$PDFLATEX" || PDFLATEX="no" if test $? -ne 0; then - eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"pdflatex\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"xelatex pdflatex\"`\" if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then - command="echo ERROR: pdflatex not found" + command="echo ERROR: xelatex pdflatex not found" # abort configure process here? else - command="- echo pdflatex not found" + command="- echo xelatex pdflatex not found" fi eval "PDFLATEX"='$command' false @@ -13275,7 +14239,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -13312,6 +14277,163 @@ $as_echo "$ver" >&6; } fi +if test "$PDFLATEX" = "xelatex"; then + + for ac_prog in xetex +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_PDFTEX+set}" = set; then + $as_echo_n "(cached) " >&6 +else + 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 +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_PDFTEX="$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 +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 "$PDFTEX" && break +done +test -n "$PDFTEX" || PDFTEX="no" + + + + 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 . ) + false + fi + + if test $? -ne 0; then + + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"xetex\"`\" + + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + command="echo ERROR: xetex not found" + # abort configure process here? + else + command="- echo xetex not found" + fi + eval "PDFTEX"='$command' + false + else + true + fi + + if test $? -eq 0 -a -n ""; then + + r="`eval echo '$'"PDFTEX"`" + { $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-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ + | 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 "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= (installed: $ver)"\"`\" + + fi + vervar="`echo PDFTEX | tr 'a-z' 'A-Z'`_VERSION" + eval `echo $vervar=$num` +## AC_SUBST(`eval echo $vervar`) + + fi + + if test "$PDFTEX" = "xetex"; then + # For avoiding PDF destination name replacement. + PDFTEX=$ugh_ugh_autoconf250_builddir/scripts/build/out$CONFIGSUFFIX/xetex-with-options + PDFLATEX=$ugh_ugh_autoconf250_builddir/scripts/build/out$CONFIGSUFFIX/xelatex-with-options + fi +else for ac_prog in pdfetex pdftex etex do @@ -13424,7 +14546,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -13461,6 +14584,7 @@ $as_echo "$ver" >&6; } fi +fi for ac_prog in texi2pdf do @@ -13573,7 +14697,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -13722,7 +14847,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -13897,7 +15023,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -14046,7 +15173,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -14196,7 +15324,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi @@ -14345,7 +15474,8 @@ $as_echo_n "checking $r version... " >&6; } if test -z "$_ver"; then ## If empty, try date [fontforge] - eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ + | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ | head -n 1 \ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi