X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=10a18a76b29da98b39bbb1c729c2866203862c1f;hb=refs%2Ftags%2Frelease%2F1.1.47;hp=69f89668978f00cbe8f7d7413cd3738b8f3dc412;hpb=ae9dfbb452eff2e47f1330854a12d73161fcb677;p=lilypond.git

diff --git a/configure.in b/configure.in
index 69f8966897..10a18a76b2 100644
--- a/configure.in
+++ b/configure.in
@@ -16,14 +16,9 @@ AC_STEPMAKE_COMPILE
 # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h)
 
 printing_b=no
-guile_b=no
 AC_ARG_ENABLE(printing,
     [  enable-printing         turn on debug printing. Default: off],
     [printing_b=$enableval])
-AC_ARG_ENABLE(guile,
-    [  enable-guile            link in GUILE. Default: off],
-    [guile_b=$enableval])
-
     
 if test "$optimise_b" = yes; then
     DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
@@ -40,21 +35,14 @@ AC_STEPMAKE_LOCALE
 AC_STEPMAKE_GETTEXT
 AC_STEPMAKE_MSGFMT
 AC_STEPMAKE_TEXMF
-# AC_STEPMAKE_TEXMF_DIRS
+AC_STEPMAKE_TEXMF_DIRS
 AC_STEPMAKE_YODL
-
+AC_STEPMAKE_GUILE
 
 dnl should check out -print
 dnl huh?
 dnl AC_CHECK_SEARCH_RESULT($FIND, find, Please use --enable-tex-dir)
 
-case $guile_b in 
-    yes)
-    AC_CHECK_LIB(guile, scm_shell)
-
-    ;;
-esac
-    
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(memmem snprintf vsnprintf gettext)
@@ -64,7 +52,23 @@ AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
 AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
 AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl,  
-    You should install Yodl 1.30.2 or better)
+    You should install Yodl 1.30.2 or newer)
+
+AC_MSG_CHECKING(links for running from sourcetree)
+LILYPONDPREFIX=$absolute_builddir
+LOCALES="it nl"
+for i in $LOCALES; do
+	dir=$LILYPONDPREFIX/share/locale/$i/LC_MESSAGES
+	if test ! -x $dir ; then
+		mkdir -p $dir
+	fi
+	rm -f $dir/lilypond.mo 
+	ln -sf $LILYPONDPREFIX/po/out/$i.mo $dir/lilypond.mo
+done
+rm -f afm; ln -sf $LILYPONDPREFIX/mf/out afm
+rm -f tfm; ln -sf $LILYPONDPREFIX/mf/out tfm
+rm -f cmtfm; ln -sf $TEX_TFMDIR cmtfm
+AC_MSG_RESULT(ok)
 
 AC_STEPMAKE_END