patch::: 1.3.25.jcn2

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 69f89668978f00cbe8f7d7413cd3738b8f3dc412..0b83441d4d58dd23dbdf0f383e2811ad009e5be8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,20 +16,21 @@ 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"
     AC_DEFINE(STRINGS_UTILS_INLINED)
 fi
 
+if test "$printing_b" = no; then
+    # ugh
+    AC_DEFINE(NPRINT)
+    DEFINES="$DEFINES -DNPRINT"
+fi
+
 AC_STEPMAKE_CXX
 AC_STEPMAKE_GXX
 AC_STEPMAKE_CXXTEMPLATE
@@ -40,21 +41,13 @@ AC_STEPMAKE_LOCALE
 AC_STEPMAKE_GETTEXT
 AC_STEPMAKE_MSGFMT
 AC_STEPMAKE_TEXMF
-# AC_STEPMAKE_TEXMF_DIRS
-AC_STEPMAKE_YODL
-
+AC_STEPMAKE_TEXMF_DIRS
+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)
@@ -63,8 +56,8 @@ AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
 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)
+AC_PATH_PROG(PERL, perl, error)
+
 
 AC_STEPMAKE_END