X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=configure;h=04d9515b85885f3292678bb9829b34acd6b01834;hb=c154dcac0e1469911bd38cc7d2df5f5fc47e4982;hp=fe4de2b53c8053504bc134b8689eb2932b2925c1;hpb=7fe3cccd7cfcc4d0df003bc887694779354febfa;p=lilypond.git diff --git a/configure b/configure index fe4de2b53c..04d9515b85 100755 --- a/configure +++ b/configure @@ -651,6 +651,9 @@ BIBTEX DBLATEX TEXI2HTML MAKEINFO +USE_EXTRACTPDFMARK +EXTRACTPDFMARK +GS920 GHOSTSCRIPT PERL GUILE @@ -692,6 +695,8 @@ CXXCPP ac_ct_CXX CXXFLAGS CXX +URWOTF_FILES +URWOTF_DIR TEXGYRE_FILES TEXGYRE_DIR FCLIST @@ -790,6 +795,7 @@ enable_config enable_documentation enable_guile2 with_texgyre_dir +with_urwotf_dir enable_relocation enable_rpath enable_static_gxx @@ -1457,6 +1463,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --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 @@ -3081,6 +3088,15 @@ else fi + +# Check whether --with-urwotf-dir was given. +if test "${with_urwotf_dir+set}" = set; then + withval=$with_urwotf_dir; URWOTF_DIR=$withval +else + URWOTF_DIR="" +fi + + reloc_b=no # Check whether --enable-relocation was given. if test "${enable_relocation+set}" = set; then @@ -4334,6 +4350,87 @@ 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; } + + +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 +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-BoldItalic.otf \ + NimbusSans-Italic.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 "$MISSING_URWOTF_FILES"="NimbusSans-BoldItalic.otf NimbusSans-Italic.otf" && \ + test -f "$URWOTF_DIR/NimbusSans-BoldOblique.otf" && \ + test -f "$URWOTF_DIR/NimbusSans-Oblique.otf"; then + MISSING_URWOTF_FILES="" + URWOTF_FILES="$URWOTF_FILES NimbusSans-BoldOblique.otf NimbusSans-Oblique.otf" +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=tree;hb=1f28a6fcd2176256a995db907d9ffe6e1b9b83e9' and put them under '~/.local/share/fonts' etc., or use --with-urwotf-dir)"\"`\" + + fi + else + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"'(these files are missing: $MISSING_URWOTF_FILES)'\"`\" + + fi +else + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -8320,7 +8417,16 @@ then $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 + for r in $GUILE_CONFIG \ + $target_guile_config $host_guile_config $build_guile_config \ + guile-config \ + guile2-config guile-2-config guile-config-2 \ + guile2.2-config guile-2.2-config guile-config-2.2 \ + guile2.0-config guile-2.0-config guile-config-2.0 \ + guile1-config guile-1-config guile-config-1 \ + guile1.9-config guile-1.9-config guile-config-1.9 \ + guile1.8-config guile-1.8-config guile-config-1.8; \ + do exe=` ## which doesn't work in ash, if /usr/bin/which isn't installed ## type -p doesn't work in ash @@ -8383,7 +8489,7 @@ $as_echo_n "checking for guile-config... " >&6; } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` sup=` - echo "2.2.0" | awk -F. ' + echo "2.3.0" | awk -F. ' { if ($3) {three = $3} else {three = 0} @@ -8394,8 +8500,8 @@ $as_echo_n "checking for guile-config... " >&6; } guile_config="$r >= 2.0.7 (installed: $ver)" continue else - if test -n "2.2.0" -a "$num" -ge "$sup"; then - guile_config="$r < 2.2.0 (installed: $ver)" + if test -n "2.3.0" -a "$num" -ge "$sup"; then + guile_config="$r < 2.3.0 (installed: $ver)" continue else guile_config=$r @@ -8809,7 +8915,16 @@ else $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 + for r in $GUILE_CONFIG \ + $target_guile_config $host_guile_config $build_guile_config \ + guile-config \ + guile2-config guile-2-config guile-config-2 \ + guile2.2-config guile-2.2-config guile-config-2.2 \ + guile2.0-config guile-2.0-config guile-config-2.0 \ + guile1-config guile-1-config guile-config-1 \ + guile1.9-config guile-1.9-config guile-config-1.9 \ + guile1.8-config guile-1.8-config guile-config-1.8; \ + do exe=` ## which doesn't work in ash, if /usr/bin/which isn't installed ## type -p doesn't work in ash @@ -11571,23 +11686,23 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for pangoft2 >= 1.6.0" >&5 -$as_echo_n "checking for pangoft2 >= 1.6.0... " >&6; } + { $as_echo "$as_me:$LINENO: checking for pangoft2 >= 1.38.0" >&5 +$as_echo_n "checking for pangoft2 >= 1.38.0... " >&6; } - if $PKG_CONFIG --exists "pangoft2 >= 1.6.0" ; then + if $PKG_CONFIG --exists "pangoft2 >= 1.38.0" ; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } succeeded=yes { $as_echo "$as_me:$LINENO: checking PANGO_FT2_CFLAGS" >&5 $as_echo_n "checking PANGO_FT2_CFLAGS... " >&6; } - PANGO_FT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2 >= 1.6.0"` + PANGO_FT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2 >= 1.38.0"` { $as_echo "$as_me:$LINENO: result: $PANGO_FT2_CFLAGS" >&5 $as_echo "$PANGO_FT2_CFLAGS" >&6; } { $as_echo "$as_me:$LINENO: checking PANGO_FT2_LIBS" >&5 $as_echo_n "checking PANGO_FT2_LIBS... " >&6; } - PANGO_FT2_LIBS=`$PKG_CONFIG --libs "pangoft2 >= 1.6.0"` + PANGO_FT2_LIBS=`$PKG_CONFIG --libs "pangoft2 >= 1.38.0"` { $as_echo "$as_me:$LINENO: result: $PANGO_FT2_LIBS" >&5 $as_echo "$PANGO_FT2_LIBS" >&6; } else @@ -11595,7 +11710,7 @@ $as_echo "$PANGO_FT2_LIBS" >&6; } PANGO_FT2_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - PANGO_FT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2 >= 1.6.0"` + PANGO_FT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2 >= 1.38.0"` fi @@ -11605,18 +11720,22 @@ $as_echo "$PANGO_FT2_LIBS" >&6; } fi if test $succeeded = yes; then - have_pangoft2=yes + have_pangoft2_with_otf_feature=yes else true fi - if test "$have_pangoft2" = yes ; then + if test "$have_pangoft2_with_otf_feature" = yes ; then cat >>confdefs.h <<\_ACEOF #define HAVE_PANGO16 1 _ACEOF cat >>confdefs.h <<\_ACEOF #define HAVE_PANGO_FT2 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_PANGO_FT2_WITH_OTF_FEATURE 1 _ACEOF # Do not pollute user-CPPFLAGS with configure-CPPFLAGS @@ -11877,14 +11996,21 @@ done LIBS="$save_LIBS" else # UGR - #r="libpangoft2-dev or pangoft2-devel"e - r="libpango1.0-dev or pango?-devel" - ver="`pkg-config --modversion pangoft2`" + #r="libpangoft2-dev or pangoft2-devel"e + r="libpango1.0-dev or pango?-devel" + ver="`pkg-config --modversion pangoft2`" + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= 1.38.0 (It is required if you'd like "\"`\" + + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""to use OpenType font feature. "\"`\" - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 1.6.0 (installed: $ver)"\"`\" + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""installed: $ver)"\"`\" fi +if test "$have_pangoft2_with_otf_feature" != yes ; then succeeded=no @@ -11941,31 +12067,31 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for fontconfig >= 2.4.0" >&5 -$as_echo_n "checking for fontconfig >= 2.4.0... " >&6; } + { $as_echo "$as_me:$LINENO: checking for pangoft2 >= 1.6.0" >&5 +$as_echo_n "checking for pangoft2 >= 1.6.0... " >&6; } - if $PKG_CONFIG --exists "fontconfig >= 2.4.0" ; then + if $PKG_CONFIG --exists "pangoft2 >= 1.6.0" ; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking FONTCONFIG_CFLAGS" >&5 -$as_echo_n "checking FONTCONFIG_CFLAGS... " >&6; } - FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.4.0"` - { $as_echo "$as_me:$LINENO: result: $FONTCONFIG_CFLAGS" >&5 -$as_echo "$FONTCONFIG_CFLAGS" >&6; } + { $as_echo "$as_me:$LINENO: checking PANGO_FT2_CFLAGS" >&5 +$as_echo_n "checking PANGO_FT2_CFLAGS... " >&6; } + PANGO_FT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2 >= 1.6.0"` + { $as_echo "$as_me:$LINENO: result: $PANGO_FT2_CFLAGS" >&5 +$as_echo "$PANGO_FT2_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking FONTCONFIG_LIBS" >&5 -$as_echo_n "checking FONTCONFIG_LIBS... " >&6; } - FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.4.0"` - { $as_echo "$as_me:$LINENO: result: $FONTCONFIG_LIBS" >&5 -$as_echo "$FONTCONFIG_LIBS" >&6; } + { $as_echo "$as_me:$LINENO: checking PANGO_FT2_LIBS" >&5 +$as_echo_n "checking PANGO_FT2_LIBS... " >&6; } + PANGO_FT2_LIBS=`$PKG_CONFIG --libs "pangoft2 >= 1.6.0"` + { $as_echo "$as_me:$LINENO: result: $PANGO_FT2_LIBS" >&5 +$as_echo "$PANGO_FT2_LIBS" >&6; } else - FONTCONFIG_CFLAGS="" - FONTCONFIG_LIBS="" + PANGO_FT2_CFLAGS="" + PANGO_FT2_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig >= 2.4.0"` + PANGO_FT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2 >= 1.6.0"` fi @@ -11975,51 +12101,305 @@ $as_echo "$FONTCONFIG_LIBS" >&6; } fi if test $succeeded = yes; then - have_fontconfig=yes + have_pangoft2=yes else true fi - if test "$have_fontconfig" = yes ; then + if test "$have_pangoft2" = yes ; then cat >>confdefs.h <<\_ACEOF -#define HAVE_FONTCONFIG 1 +#define HAVE_PANGO16 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_PANGO_FT2 1 _ACEOF # Do not pollute user-CPPFLAGS with configure-CPPFLAGS save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" - CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS" - LIBS="$FONTCONFIG_LIBS $LIBS" + CPPFLAGS="$CPPFLAGS $PANGO_FT2_CFLAGS" + LIBS="$PANGO_FT2_LIBS $LIBS" +for ac_header in pango/pangoft2.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 + # 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. */ +$ac_includes_default +#include <$ac_header> +_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 + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - CPPFLAGS="$save_CPPFLAGS" - LIBS="$save_LIBS" - else - r="libfontconfig-dev or fontconfig-devel" - ver="`pkg-config --modversion fontconfig`" + ac_header_compiler=no +fi - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 2.4.0 (installed: $ver)"\"`\" +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; } - fi +# 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 +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_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); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } - succeeded=no +# 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;} - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; 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_PKG_CONFIG+set}" = set; then + ;; +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 - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + 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 + +fi + +done + + +for ac_func in pango_ft2_font_map_create_context +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. */ +/* 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 () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +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_link") 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_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 + + eval "$as_ac_var=no" +fi + +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 + +fi +done + + + + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + else + # UGR + #r="libpangoft2-dev or pangoft2-devel"e + r="libpango1.0-dev or pango?-devel" + ver="`pkg-config --modversion pangoft2`" + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 1.6.0 (installed: $ver)"\"`\" + + fi + +fi + + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; 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_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 @@ -12058,31 +12438,31 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for freetype2 >= 2.1.10" >&5 -$as_echo_n "checking for freetype2 >= 2.1.10... " >&6; } + { $as_echo "$as_me:$LINENO: checking for fontconfig >= 2.4.0" >&5 +$as_echo_n "checking for fontconfig >= 2.4.0... " >&6; } - if $PKG_CONFIG --exists "freetype2 >= 2.1.10" ; then + if $PKG_CONFIG --exists "fontconfig >= 2.4.0" ; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking FREETYPE2_CFLAGS" >&5 -$as_echo_n "checking FREETYPE2_CFLAGS... " >&6; } - FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.1.10"` - { $as_echo "$as_me:$LINENO: result: $FREETYPE2_CFLAGS" >&5 -$as_echo "$FREETYPE2_CFLAGS" >&6; } + { $as_echo "$as_me:$LINENO: checking FONTCONFIG_CFLAGS" >&5 +$as_echo_n "checking FONTCONFIG_CFLAGS... " >&6; } + FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.4.0"` + { $as_echo "$as_me:$LINENO: result: $FONTCONFIG_CFLAGS" >&5 +$as_echo "$FONTCONFIG_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking FREETYPE2_LIBS" >&5 -$as_echo_n "checking FREETYPE2_LIBS... " >&6; } - FREETYPE2_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.1.10"` - { $as_echo "$as_me:$LINENO: result: $FREETYPE2_LIBS" >&5 -$as_echo "$FREETYPE2_LIBS" >&6; } + { $as_echo "$as_me:$LINENO: checking FONTCONFIG_LIBS" >&5 +$as_echo_n "checking FONTCONFIG_LIBS... " >&6; } + FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.4.0"` + { $as_echo "$as_me:$LINENO: result: $FONTCONFIG_LIBS" >&5 +$as_echo "$FONTCONFIG_LIBS" >&6; } else - FREETYPE2_CFLAGS="" - FREETYPE2_LIBS="" + FONTCONFIG_CFLAGS="" + FONTCONFIG_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - FREETYPE2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2 >= 2.1.10"` + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig >= 2.4.0"` fi @@ -12092,55 +12472,172 @@ $as_echo "$FREETYPE2_LIBS" >&6; } fi if test $succeeded = yes; then - have_freetype2=yes + have_fontconfig=yes else true fi - if test "$have_freetype2" = yes; then + if test "$have_fontconfig" = yes ; then cat >>confdefs.h <<\_ACEOF -#define HAVE_FREETYPE2 1 +#define HAVE_FONTCONFIG 1 _ACEOF + # Do not pollute user-CPPFLAGS with configure-CPPFLAGS save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" - CPPFLAGS="$FREETYPE2_CFLAGS $CPPFLAGS" - LIBS="$FREETYPE2_LIBS $LIBS" + CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS" + LIBS="$FONTCONFIG_LIBS $LIBS" CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" else - # UGR - #r="libfreetype2-dev or freetype2-devel" - r="libfreetype6-dev or freetype?-devel" - ver="`pkg-config --modversion freetype2`" + r="libfontconfig-dev or fontconfig-devel" + ver="`pkg-config --modversion fontconfig`" - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 2.1.10 (installed: $ver)"\"`\" + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 2.4.0 (installed: $ver)"\"`\" fi - { $as_echo "$as_me:$LINENO: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; 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_PKG_CONFIG+set}" = set; then $as_echo_n "(cached) " >&6 else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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 + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { $as_echo "$as_me:$LINENO: checking for freetype2 >= 2.1.10" >&5 +$as_echo_n "checking for freetype2 >= 2.1.10... " >&6; } + + if $PKG_CONFIG --exists "freetype2 >= 2.1.10" ; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + + { $as_echo "$as_me:$LINENO: checking FREETYPE2_CFLAGS" >&5 +$as_echo_n "checking FREETYPE2_CFLAGS... " >&6; } + FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.1.10"` + { $as_echo "$as_me:$LINENO: result: $FREETYPE2_CFLAGS" >&5 +$as_echo "$FREETYPE2_CFLAGS" >&6; } + + { $as_echo "$as_me:$LINENO: checking FREETYPE2_LIBS" >&5 +$as_echo_n "checking FREETYPE2_LIBS... " >&6; } + FREETYPE2_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.1.10"` + { $as_echo "$as_me:$LINENO: result: $FREETYPE2_LIBS" >&5 +$as_echo "$FREETYPE2_LIBS" >&6; } + else + FREETYPE2_CFLAGS="" + FREETYPE2_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + FREETYPE2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2 >= 2.1.10"` + + fi + + + + fi + fi + + if test $succeeded = yes; then + have_freetype2=yes + else + true + fi + + if test "$have_freetype2" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_FREETYPE2 1 +_ACEOF + + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$FREETYPE2_CFLAGS $CPPFLAGS" + LIBS="$FREETYPE2_LIBS $LIBS" + + + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + else + # UGR + #r="libfreetype2-dev or freetype2-devel" + r="libfreetype6-dev or freetype?-devel" + ver="`pkg-config --modversion freetype2`" + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 2.1.10 (installed: $ver)"\"`\" + + fi + + + + { $as_echo "$as_me:$LINENO: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; *) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 $as_echo "$as_me: error: invalid value of canonical host" >&2;} { (exit 1); exit 1; }; };; @@ -12263,7 +12760,337 @@ 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_WINDRES="$ac_prog" + ac_cv_prog_WINDRES="$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 +WINDRES=$ac_cv_prog_WINDRES +if test -n "$WINDRES"; then + { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 +$as_echo "$WINDRES" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$WINDRES" && break +done +test -n "$WINDRES" || WINDRES="no" + + + + r="`eval echo '$'"WINDRES"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"WINDRES"`' : '.*\(echo\)' > /dev/null; then + true + else + ##STEPMAKE_WARN(cannot find . ) + false + fi + + if test $? -ne 0; then + + eval "x"=\"`eval echo \"'$'x\" \"$target-windres windres\"`\" + + if test "x" = "REQUIRED"; then + command="echo ERROR: $target-windres windres not found" + # abort configure process here? + else + command="- echo $target-windres windres not found" + fi + eval "WINDRES"='$command' + false + else + true + fi + + 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 +if test "$GUILEv2" = "yes" +then + + { $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 "2.0.7" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + sup=` + echo "2.3.0" | awk -F. ' + { + if ($3) {three = $3} + else {three = 0} + } + {printf "%.0f\n", $1*1000000 + $2*1000 + three}' +` + if test -n "2.0.7" && test "$num" -lt "$req"; then + guile="$r >= 2.0.7 (installed: $ver)" + continue + else + if test -n "2.3.0" && test "$num" -ge "$sup"; then + guile="$r < 2.3.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 @@ -12271,51 +13098,25 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -WINDRES=$ac_cv_prog_WINDRES -if test -n "$WINDRES"; then - { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 -$as_echo "$WINDRES" >&6; } +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 "$WINDRES" && break + test -n "$GUILE" && break done -test -n "$WINDRES" || WINDRES="no" - - - - r="`eval echo '$'"WINDRES"`" - if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"WINDRES"`' : '.*\(echo\)' > /dev/null; then - true - else - ##STEPMAKE_WARN(cannot find . ) - false - fi - - if test $? -ne 0; then - - eval "x"=\"`eval echo \"'$'x\" \"$target-windres windres\"`\" - - if test "x" = "REQUIRED"; then - command="echo ERROR: $target-windres windres not found" - # abort configure process here? - else - command="- echo $target-windres windres not found" - fi - eval "WINDRES"='$command' - false - else - true - fi - if test $? -eq 0 -a -n ""; then + if test -n ""; then - r="`eval echo '$'"WINDRES"`" + r="`eval echo '$'"GUILE"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12384,19 +13185,18 @@ $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 ""=\"`eval echo \"'$'\" \""$r >= (installed: $ver)"\"`\" fi - vervar="`echo WINDRES | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo GUILE | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) + fi fi - - -# guile executable for some scripts +else { $as_echo "$as_me:$LINENO: checking for guile" >&5 $as_echo_n "checking for guile... " >&6; } @@ -12579,9 +13379,211 @@ $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 + 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 + + +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_GUILE="$GUILE" # Let the user override the test with a path. + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12591,7 +13593,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_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 @@ -12602,22 +13604,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; } +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 "$GUILE" && break + test -n "$PERL" && break done if test -n ""; then - r="`eval echo '$'"GUILE"`" + r="`eval echo '$'"PERL"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12686,10 +13688,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 "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= (installed: $ver)"\"`\" fi - vervar="`echo GUILE | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo PERL | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) @@ -12698,20 +13700,25 @@ $as_echo "$ver" >&6; } -# perl for help2man and for mf2pt1.pl +## 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 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_GHOSTSCRIPT+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 "$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 @@ -12720,7 +13727,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_GHOSTSCRIPT="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12730,24 +13737,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; } +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 "$PERL" && break + test -n "$GHOSTSCRIPT" && break done -test -n "$PERL" || PERL="no" +test -n "$GHOSTSCRIPT" || GHOSTSCRIPT="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 '$'"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 . ) @@ -12756,33 +13763,33 @@ test -n "$PERL" || PERL="no" if test $? -ne 0; then - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"perl\"`\" + eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"gs\"`\" - if test "REQUIRED" = "REQUIRED"; then - command="echo ERROR: perl not found" + if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + command="echo ERROR: gs not found" # abort configure process here? else - command="- echo perl not found" + command="- echo gs not found" fi - eval "PERL"='$command' + eval "GHOSTSCRIPT"='$command' false else true fi if test $? -eq 0; then - 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_path_PERL+set}" = set; then +if test "${ac_cv_path_GHOSTSCRIPT+set}" = set; then $as_echo_n "(cached) " >&6 else - case $PERL in + case $GHOSTSCRIPT in [\\/]* | ?:[\\/]*) - ac_cv_path_PERL="$PERL" # 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 @@ -12792,7 +13799,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_PERL="$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 @@ -12803,22 +13810,22 @@ 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; } +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 "$PERL" && break + test -n "$GHOSTSCRIPT" && break done - if test -n ""; then + if test -n "8.60"; then - r="`eval echo '$'"PERL"`" + r="`eval echo '$'"GHOSTSCRIPT"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -12876,7 +13883,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} @@ -12887,10 +13894,10 @@ $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 "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= 8.60 (installed: $ver)"\"`\" fi - vervar="`echo PERL | tr 'a-z' 'A-Z'`_VERSION" + vervar="`echo GHOSTSCRIPT | tr 'a-z' 'A-Z'`_VERSION" eval `echo $vervar=$num` ## AC_SUBST(`eval echo $vervar`) @@ -12899,12 +13906,7 @@ $as_echo "$ver" >&6; } -## 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 @@ -12913,11 +13915,11 @@ do 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_GS920+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 "$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 @@ -12926,7 +13928,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_GS920="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12936,24 +13938,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; } +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 "$GHOSTSCRIPT" && break + test -n "$GS920" && break done -test -n "$GHOSTSCRIPT" || GHOSTSCRIPT="no" +test -n "$GS920" || GS920="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 '$'"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 . ) @@ -12962,43 +13964,121 @@ test -n "$GHOSTSCRIPT" || GHOSTSCRIPT="no" if test $? -ne 0; then - eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \"gs\"`\" + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"gs\"`\" - if test "$DOCUMENTATION_REQUIRED" = "REQUIRED"; then + if test "OPTIONAL" = "REQUIRED"; then command="echo ERROR: gs not found" # abort configure process here? else command="- echo gs not found" fi - eval "GHOSTSCRIPT"='$command' + eval "GS920"='$command' false else true fi - if test $? -eq 0; then - for ac_prog in gs + if test $? -eq 0 -a -n "9.20"; then + + r="`eval echo '$'"GS920"`" + { $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 "9.20" | 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 "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""$r >= 9.20 (installed: $ver)"\"`\" + + fi + vervar="`echo GS920 | tr 'a-z' 'A-Z'`_VERSION" + eval `echo $vervar=$num` +## AC_SUBST(`eval echo $vervar`) + + fi + + + 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_path_GHOSTSCRIPT+set}" = set; then +if test "${ac_cv_prog_EXTRACTPDFMARK+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 + 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 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" + ac_cv_prog_EXTRACTPDFMARK="$ac_prog" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -13006,25 +14086,51 @@ 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; } +fi +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 "$EXTRACTPDFMARK" || EXTRACTPDFMARK="no" - if test -n "8.60"; then - r="`eval echo '$'"GHOSTSCRIPT"`" + + 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 . ) + false + fi + + if test $? -ne 0; then + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"extractpdfmark\"`\" + + if test "OPTIONAL" = "REQUIRED"; then + command="echo ERROR: extractpdfmark not found" + # abort configure process here? + else + command="- echo extractpdfmark not found" + fi + eval "EXTRACTPDFMARK"='$command' + false + else + true + fi + + if test $? -eq 0 -a -n ""; then + + r="`eval echo '$'"EXTRACTPDFMARK"`" { $as_echo "$as_me:$LINENO: checking $r version" >&5 $as_echo_n "checking $r version... " >&6; } exe=` @@ -13082,7 +14188,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} @@ -13093,16 +14199,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