patch::: 1.3.80.mb1

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 43abc3439be33918f9f4e4c23e114e1acc9c0461..f19b156e364cd12323e6e48500fa3824e86937e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,17 +14,24 @@ AC_CONFIG_SUBDIRS(stepmake)
 # Uncomment the configuration options your package needs.
 AC_STEPMAKE_COMPILE
 # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h)
+AC_HAVE_HEADERS(assert.h)
 
 printing_b=no
 AC_ARG_ENABLE(printing,
     [  enable-printing         turn on debug printing. Default: off],
     [printing_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
@@ -35,9 +42,9 @@ 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
+AC_STEPMAKE_KPATHSEA
 
 dnl should check out -print
 dnl huh?
@@ -45,22 +52,13 @@ dnl AC_CHECK_SEARCH_RESULT($FIND, find, Please use --enable-tex-dir)
 
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(memmem snprintf vsnprintf gettext)
+AC_CHECK_FUNCS(memmem snprintf vsnprintf gettext isinf)
 
 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 newer)
+AC_PATH_PROG(PERL, perl, error)
 
-
-AC_MSG_CHECKING(Checking TFM directory)
-CMR10=`kpsewhich tfm cmr10.tfm`
-TEX_TFMDIR=`dirname $CMR10`
-AC_MSG_RESULT($TEX_TFMDIR)
-
-AC_SUBST(TEX_TFMDIR)
 AC_STEPMAKE_END
 
-