X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=325dfe2ddd2757a66f55f2da0840e667e54826a7;hb=edf17353d89f4f6bd831466262402bb9151a26ca;hp=42c529d949d9b7191fa5b5e60b3b8f3cc6b33bb4;hpb=1d519e03f98492015b452fe72b97fd68fee27305;p=lilypond.git diff --git a/configure.in b/configure.in index 42c529d949..325dfe2ddd 100644 --- a/configure.in +++ b/configure.in @@ -30,35 +30,20 @@ AC_SUBST(DOCUMENTATION) gui_b=no AC_ARG_ENABLE(gui, - [ --enable-gui compile with experimental GNOME output module. Default: off], + [ --enable-gui compile with experimental GNOME output. Default: off], [gui_b=$enableval]) -NCSB_DIR=unknown -AC_ARG_ENABLE(ncsb, -[ --enable-ncsb-dir set the path where Century Schoolbook fonts can be found. - Default: detect with locate(1)], - [NCSB_DIR=$enableval]) - +AC_ARG_WITH(ncsb-dir, + [ --with-ncsb-dir=DIR location of Century Schoolbook fonts.], + [NCSB_DIR=$withval], + [NCSB_DIR=""]) reloc_b=no AC_ARG_ENABLE(relocation, [ --enable-relocation compile with dynamic relocation. Default: off], [reloc_b=$enableval]) -FRAMEWORKDIR=".." -AC_ARG_WITH(framework-dir, - [ --with-framework-dir=DIR - relative the optional framework directory],[ - if test "$withval" = "yes" -o "$withval" = "no"; then - AC_MSG_WARN(Usage: --with-framework-dir=../lib/FRAMEWORK/DIR) - else - FRAMEWORKDIR="${withval}" - LDFLAGS="$LDFLAGS -Wl,--rpath,'\$\${ORIGIN}/$FRAMEWORKDIR/lib'" - fi - ]) -AC_DEFINE_UNQUOTED(FRAMEWORKDIR, ["${FRAMEWORKDIR}"]) - LINK_GXX_STATICALLY=no AC_ARG_ENABLE(static-gxx, [ --enable-static-gxx link libstdc++.a statically. Default: off], @@ -68,11 +53,44 @@ AC_SUBST(LINK_GXX_STATICALLY) # must come before any header checks STEPMAKE_COMPILE -STEPMAKE_PYTHON(REQUIRED, 2.2) -STEPMAKE_GCC(REQUIRED, 2.8) +AC_CHECK_PROG(FCMATCH, fc-match, fc-match) +AC_MSG_CHECKING([New Century Schoolbook PFB files]) +AC_SUBST(NCSB_SOURCE_FILES) +if test "$NCSB_DIR" != "" ; then + NCSB_SOURCE_FILES="" + for f in c059013l c059016l c059033l c059036l; do + if test ! -f "$NCSB_DIR/$f.pfb"; then + AC_MSG_WARN($NCSB_DIR does not contain $f.pfb.) + else + NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $NCSB_SOURCE_FILES" + fi + done +else + if test "$FCMATCH" != ""; then + for style in Roman Italic "Bold Italic" Bold; do + NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:' | grep -v "\.ttf"` + + NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'` + NCSB_FILE=`$PYTHON "$srcdir/buildscripts/readlink.py" $NCSB_FILE` + NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES" + done + else + AC_MSG_RESULT(not found) + echo "Can't find Century Schoolbook files. Install FontConfig's fc-match," + echo "or use --with-ncsb-dir" + fi +fi +AC_MSG_RESULT($NCSB_SOURCE_FILES) + + + +STEPMAKE_PYTHON(REQUIRED, 2.4) +STEPMAKE_GCC(REQUIRED, 3.4) + STEPMAKE_CXX(REQUIRED) -STEPMAKE_GXX(REQUIRED, 3.0.5) +STEPMAKE_GXX(REQUIRED, 3.4) STEPMAKE_CXXTEMPLATE +STEPMAKE_STL_DATA_METHOD STEPMAKE_LIB(REQUIRED) STEPMAKE_DLOPEN # Do not use bison 1.50 and 1.75. @@ -87,18 +105,38 @@ STEPMAKE_GETTEXT STEPMAKE_MSGFMT(REQUIRED) STEPMAKE_TEXMF(REQUIRED) STEPMAKE_TEXMF_DIRS -STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.5) -STEPMAKE_MAKEINFO(REQUIRED) + +## should check for 1.8.2 ? +STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.0) + + +## check rational bugfix. +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS" +AC_MSG_CHECKING(GUILE rational bugfix) +AC_TRY_CPP( +#include +#ifdef SCM_FRACTION_REDUCED_BIT +#error +#endif +, +AC_MSG_RESULT(ok), +REQUIRED="$REQUIRED GUILE-with-rational-bugfix" +AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt)) +CPPFLAGS="$save_CPPFLAGS" + + +# We check for makeinfo below, too. Really duplicate that check? +## STEPMAKE_MAKEINFO(REQUIRED, 4.11) STEPMAKE_PYTHON_DEVEL(REQUIRED) STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15) -STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.9) STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624) -AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h]) +AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h fpu_control.h]) AC_LANG_PUSH(C++) -AC_CHECK_HEADERS([sstream]) +AC_CHECK_HEADERS([sstream boost/lambda/lambda.hpp]) AC_LANG_POP(C++) AC_HEADER_STAT AC_FUNC_MEMCMP @@ -117,27 +155,14 @@ if test "$reloc_b" = "yes"; then AC_DEFINE(ARGV0_RELOCATION) fi -AC_MSG_CHECKING([New Century Schoolbook PFB files]) -if test "$NCSB_DIR" = "unknown"; then - which locate >& /dev/null - if test "$?" = "0"; then - ## sort to give precedence to /usr/ - NCSB_DIR=`locate c059033l.pfb | sort -r | head -1` - if then "$NCSB_DIR" = ""; - AC_MSG_WARN(Could not find c059033l.pfb. Use --enable-ncsb-path to set path) - fi - NCSB_DIR=`dirname "$NCSB_DIR"` - else - AC_MSG_WARN(Could not find locate(1). Use --enable-ncsb-path to set path to c059033l.pfb) - fi -fi -AC_MSG_RESULT($NCSB_DIR) -AC_SUBST(NCSB_DIR) + +HOST_ARCH=`$CC -dumpmachine` +AC_SUBST(HOST_ARCH) STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0) #STEPMAKE_PANGO(pango, REQUIRED, 1.6.0) STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0) -STEPMAKE_FREETYPE2(freetype2, REQUIRED, 0) +STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10) STEPMAKE_WINDOWS @@ -149,19 +174,15 @@ STEPMAKE_GUILE(OPTIONAL) # perl for help2man. STEPMAKE_PERL(OPTIONAL) -# New makeinfo for multi-page website docs Simply always require new -# makeinfo should avoid bug reports; if people want to build lily -# without the docs, they can find this comment and use an older -# makeinfo--but hopefully won't report makeinfo problems. -STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7) - -if test "$optimise_b" = yes; then - DEFINES="$DEFINES -DSTRING_UTILS_INLINED" - AC_DEFINE(STRINGS_UTILS_INLINED) -fi +STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11) +STEPMAKE_PROGS(TEXI2HTML, texi2html, REQUIRED, 1.79) AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") + +# must also have local.make if configure fails. +touch local.make + # Gather requirements and generate output. STEPMAKE_END @@ -174,4 +195,7 @@ Type: make$mc install to install LilyPond make$mc help to see all possible targets +Edit local.make for local Makefile overrides. + + EOF