patch::: 1.3.80.mb1

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 275a9cae64aaf1dfcdbc35001dee344e9e38879c..f19b156e364cd12323e6e48500fa3824e86937e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,6 +14,7 @@ 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,
@@ -25,6 +26,12 @@ if test "$optimise_b" = yes; then
     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,23 +42,23 @@ AC_STEPMAKE_LOCALE
 AC_STEPMAKE_GETTEXT
 AC_STEPMAKE_MSGFMT
 AC_STEPMAKE_TEXMF
-AC_STEPMAKE_YODL
-
+AC_STEPMAKE_TEXMF_DIRS
+AC_STEPMAKE_GUILE
+AC_STEPMAKE_KPATHSEA
 
 dnl should check out -print
 dnl huh?
-AC_CHECK_SEARCH_RESULT($FIND, find, Please use --enable-tex-dir)
+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 better)
+AC_PATH_PROG(PERL, perl, error)
 
 AC_STEPMAKE_END