release: 1.1.34

[lilypond.git] / configure

diff --git a/configure b/configure
index e1b187d738a279f0b528c6e1bd28d5d54bf7303c..5423c297443002e9a58d4df63578f7a21ea36309 100755 (executable)
--- a/configure
+++ b/configure
@@ -981,7 +981,7 @@ fi
 
     if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then
        LN=cp # hard link does not work under cygnus-nt
-       LN_S=cp # symbolic link does not work for native nt
+       LN_S='cp -r' # symbolic link does not work for native nt
        ZIP="zip -r -9" #
        DOTEXE=.exe
        # urg
@@ -1756,8 +1756,8 @@ test -n "$FLEX" || FLEX="error"
 
 
     if test $BISON != "error"; then
-       bison_version=`$BISON --version| sed 's/^.*version 1.//g' `
-       if test $bison_version -lt 25; then
+       bison_version=`$BISON --version | sed 's/^.*version 1.//g'`
+       if test `echo $bison_version | sed 's/\..*$//g'` -lt 25; then
            
     echo "configure: warning: Your bison is a bit old (1.$bison_version). You might have to install 1.25" 1>&2
     warn_b=yes
@@ -2565,7 +2565,7 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[/-_a-zA-Z0-9]\+ //g'` $LIBS";
+  LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[/-_a-zA-Z0-9]\+ //g'` $LIBS"
       cat >> confdefs.h <<\EOF
 #define HAVE_LIBGUILE 1
 EOF
@@ -2846,6 +2846,14 @@ test -n "$MAKEINFO" || MAKEINFO="error"
 
 
 
+echo $ac_n "checking Checking TFM directory""... $ac_c" 1>&6
+echo "configure:2851: checking Checking TFM directory" >&5
+CMR10=`kpsewhich tfm cmr10.tfm`
+TEX_TFMDIR=`dirname $CMR10`
+echo "$ac_t""$TEX_TFMDIR" 1>&6
+
+
+
     trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -3033,10 +3041,9 @@ s%@YODL2MSLESS@%$YODL2MSLESS%g
 s%@YODL2TEXINFO@%$YODL2TEXINFO%g
 s%@YODL2TXT@%$YODL2TXT%g
 s%@YODL2LESS_DIR@%$YODL2LESS_DIR%g
-s%@GUILE_CFLAGS@%$GUILE_CFLAGS%g
-s%@GUILE_LDFLAGS@%$GUILE_LDFLAGS%g
 s%@LIBOBJS@%$LIBOBJS%g
 s%@MAKEINFO@%$MAKEINFO%g
+s%@TEX_TFMDIR@%$TEX_TFMDIR%g
 
 CEOF
 EOF
@@ -3350,3 +3357,4 @@ fi
     chmod 444 GNUmakefile
 
 
+