From: fred Date: Tue, 26 Mar 2002 23:22:52 +0000 (+0000) Subject: lilypond-1.3.59 X-Git-Tag: release/1.5.59~1586 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=20f1b9951516bba4aa0ff2fe93ac9a27a240ac95;p=lilypond.git lilypond-1.3.59 --- diff --git a/configure b/configure index fa1b218de5..d35bdc4045 100755 --- a/configure +++ b/configure @@ -83,7 +83,7 @@ ac_help="$ac_help ac_help="$ac_help with-lang=LANG use LANG as language to emit messages" ac_help="$ac_help - enable-tex-tfmdir=DIR set the tex-directory where cmr10.tfm lives (default: use kpsewhich)" + enable-tfm-path=PATH set path of tex directories where tfm files live, esp.: cmr10.tfm (default: use kpsewhich)" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -2605,12 +2605,12 @@ echo "configure:2577: checking for working metafont mode" >&5 - # Check whether --enable-tex-tfmdir or --disable-tex-tfmdir was given. -if test "${enable_tex_tfmdir+set}" = set; then - enableval="$enable_tex_tfmdir" - TFMDIR=$enableval + # Check whether --enable-tfm-path or --disable-tfm-path was given. +if test "${enable_tfm_path+set}" = set; then + enableval="$enable_tfm_path" + tfm_path=$enableval else - TFMDIR=auto + tfm_path=auto fi @@ -2649,35 +2649,42 @@ test -n "$KPSEWHICH" && break done test -n "$KPSEWHICH" || KPSEWHICH="no" - echo $ac_n "checking for TeX TFM directory""... $ac_c" 1>&6 -echo "configure:2654: checking for TeX TFM directory" >&5 - if test "x$TFMDIR" = xauto ; then - if test "x$TEX_TFMDIR" = "x" ; then - if test "x$KPSEWHICH" != "xno" ; then - CMR10=`kpsewhich tfm cmr10.tfm` - TEX_TFMDIR=`dirname $CMR10` - else - - echo "configure: warning: Please set TEX_TFMDIR (to where cmr10.tfm lives): - TEX_TFMDIR=/usr/local/TeX/lib/tex/fonts ./configure" 1>&2 + echo $ac_n "checking for tfm path""... $ac_c" 1>&6 +echo "configure:2654: checking for tfm path" >&5 + + TFM_FONTS="cmr msam" + + if test "x$tfm_path" = xauto ; then + if test "x$KPSEWHICH" != "xno" ; then + for i in $TFM_FONTS; do + dir=`$KPSEWHICH tfm ${i}10.tfm` + TFM_PATH="$TFM_PATH `dirname $dir`" + done + else + + echo "configure: warning: Please specify where cmr10.tfm lives: + ./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts" 1>&2 warn_b=yes - fi fi + else + TFM_PATH=$tfm_path fi - echo "$ac_t""$TEX_TFMDIR" 1>&6 + + TFM_PATH=`echo $TFM_PATH | tr ':' ' '` + echo "$ac_t""$TFM_PATH" 1>&6 ## First, let's just see if we can find Guile at all. echo $ac_n "checking "for guile-config"""... $ac_c" 1>&6 -echo "configure:2675: checking "for guile-config"" >&5 +echo "configure:2682: checking "for guile-config"" >&5 for guile_config in guile-config $target-guile-config $build-guile-config; do echo "$ac_t"""$guile_config"" 1>&6 if ! $guile_config --version > /dev/null 2>&1 ; then echo "configure: warning: "cannot execute $guile_config"" 1>&2 echo $ac_n "checking "if we are cross compiling"""... $ac_c" 1>&6 -echo "configure:2681: checking "if we are cross compiling"" >&5 +echo "configure:2688: checking "if we are cross compiling"" >&5 guile_config=error else break @@ -2688,7 +2695,7 @@ echo "configure:2681: checking "if we are cross compiling"" >&5 exit 1 fi echo $ac_n "checking "Guile version"""... $ac_c" 1>&6 -echo "configure:2692: checking "Guile version"" >&5 +echo "configure:2699: checking "Guile version"" >&5 need_guile_version="1.3.4" guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"` echo "$ac_t"""$guile_version"" 1>&6 @@ -2701,10 +2708,8 @@ echo "configure:2692: checking "Guile version"" >&5 ## The GUILE_FLAGS macro. echo $ac_n "checking for Guile""... $ac_c" 1>&6 -echo "configure:2705: checking for Guile" >&5 - if $guile_config link > /dev/null ; then - : - else +echo "configure:2712: checking for Guile" >&5 + if ! $guile_config link > /dev/null ; then echo "$ac_t"""cannot execute $guile_config"" 1>&6 { echo "configure: error: "cannot find guile-config; is Guile installed?"" 1>&2; exit 1; } exit 1 @@ -2718,7 +2723,7 @@ echo "configure:2705: checking for Guile" >&5 # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2722: checking for $ac_word" >&5 +echo "configure:2727: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2756,7 +2761,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2760: checking for 8-bit clean memcmp" >&5 +echo "configure:2765: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2764,7 +2769,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2795,12 +2800,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2799: checking for vprintf" >&5 +echo "configure:2804: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2850,12 +2855,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2854: checking for _doprnt" >&5 +echo "configure:2859: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2908,12 +2913,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2912: checking for $ac_func" >&5 +echo "configure:2917: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2978,7 +2983,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2982: checking for $ac_word" >&5 +echo "configure:2987: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3011,7 +3016,7 @@ test -n "$MAKEINFO" || MAKEINFO="error" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3015: checking for $ac_word" >&5 +echo "configure:3020: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3236,7 +3241,7 @@ s%@MFMODE@%$MFMODE%g s%@MFPLAIN_MP@%$MFPLAIN_MP%g s%@INIMETAPOST_FLAGS@%$INIMETAPOST_FLAGS%g s%@KPSEWHICH@%$KPSEWHICH%g -s%@TEX_TFMDIR@%$TEX_TFMDIR%g +s%@TFM_PATH@%$TFM_PATH%g s%@GUILE_CFLAGS@%$GUILE_CFLAGS%g s%@GUILE_LDFLAGS@%$GUILE_LDFLAGS%g s%@GUILE@%$GUILE%g