X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=4cf095deb818adff7cb0e7d1e8e3a3787f2a9af1;hb=1cc9a861dceeb8091853ebcc0c9a9306b012457f;hp=eb276f305ae041a662727429532557e9b23672ce;hpb=0b6e6c325e2fa5831a6d26f418025b5481cbca44;p=lilypond.git

diff --git a/configure.in b/configure.in
index eb276f305a..4cf095deb8 100644
--- a/configure.in
+++ b/configure.in
@@ -14,30 +14,25 @@ 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 sys/stat.h)
+AC_HEADER_STAT
 
-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
+DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
+AC_DEFINE(STRINGS_UTILS_INLINED)
 
 AC_STEPMAKE_CXX
 AC_STEPMAKE_GXX
 AC_STEPMAKE_CXXTEMPLATE
 AC_STEPMAKE_LEXYACC
 AC_STEPMAKE_LIB
-# AC_STEPMAKE_LIBTOOL
 AC_STEPMAKE_LOCALE
 AC_STEPMAKE_GETTEXT
 AC_STEPMAKE_MSGFMT
 AC_STEPMAKE_TEXMF
 AC_STEPMAKE_TEXMF_DIRS
-AC_STEPMAKE_YODL
 AC_STEPMAKE_GUILE
+AC_STEPMAKE_KPATHSEA
+AC_STEPMAKE_BIBTEX2HTML
 
 dnl should check out -print
 dnl huh?
@@ -45,30 +40,25 @@ 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_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 `dirname $TEX_TFMDIR` cmtfm
-AC_MSG_RESULT(ok)
+AC_STEPMAKE_MAKEINFO
+
+AC_PATH_PROG(PERL, perl, error)
 
 AC_STEPMAKE_END
 
+test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""
+
+cat <<EOF
+
+Type:
+    make$mc all       to build LilyPond
+    make$mc install   to install LilyPond
+    make$mc help      to see all possible targets
+
+Do not worry if ./Documentation or ./mutopia should not build.
+EOF