X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=4292dfc92d52b2af58e149eece8a0c4c83c05a81;hb=e068bfd82740ae5cd5385a1702a06c05da08ff78;hp=a299637f1d039ae1ccc6958282e12bf6bf8de9ff;hpb=003f0d60ba4f7e269564a467295751bdb42c0f47;p=lilypond.git diff --git a/configure.in b/configure.in index a299637f1d..4292dfc92d 100644 --- a/configure.in +++ b/configure.in @@ -34,41 +34,16 @@ AC_ARG_ENABLE(gui, [gui_b=$enableval]) -std_vector=yes -AC_ARG_ENABLE(std-string, - [ --enable-std-vector compile with std::vector. Default: on], - [std_vector=$enableval]) -if test "$std_vector" = "yes"; then - # Store in config.make rather than in config.hh and have every - # source file depend on that. - DEFINES="$DEFINES -DSTD_VECTOR=1" -fi - -NCSB_DIR=unknown AC_ARG_WITH(ncsb-dir, -[ --with-ncsb-dir=DIR location of Century Schoolbook fonts - Default: detect with locate(1)], - [NCSB_DIR=$withval]) - + [ --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 location of framework],[ - 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], @@ -78,10 +53,44 @@ AC_SUBST(LINK_GXX_STATICALLY) # must come before any header checks STEPMAKE_COMPILE +# os.path.realpath() requires python 2.2 and unix 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, 4.0) + STEPMAKE_CXX(REQUIRED) -STEPMAKE_GXX(REQUIRED, 3.0.5) +STEPMAKE_GXX(REQUIRED, 4.0) STEPMAKE_CXXTEMPLATE STEPMAKE_STL_DATA_METHOD STEPMAKE_LIB(REQUIRED) @@ -98,18 +107,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" + + +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_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.19) STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624) AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.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 @@ -128,32 +157,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 - # use `type' command rather than external program `which' - type locate >& /dev/null - if test "$?" = "0"; then - for d in `locate c059033l.pfb `; do - if test -f `dirname "$d"`/c059033l.afm ; then - NCSB_DIR=`dirname "$d"` - break - fi - done - if test "$NCSB_DIR" = "unknown"; then - AC_MSG_WARN(Could not find c059033l.pfb. Use --enable-ncsb-path to set path) - fi - 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 @@ -169,15 +180,14 @@ STEPMAKE_PERL(OPTIONAL) # 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.8) 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 @@ -190,4 +200,7 @@ Type: make$mc install to install LilyPond make$mc help to see all possible targets +Edit local.make for local Makefile overrides. + + EOF