X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=1f3040a93f1c1469a9f34349e8c07756d32a8daf;hb=061183c4e77fc71e25268f0b815f502cd8a8c48a;hp=a3ca5b74af32cd0889a00c5cc1e0ce5cd8c32677;hpb=8750dbe9542ec867d6f48dc57671cafd0f1e68b4;p=lilypond.git diff --git a/configure.in b/configure.in index a3ca5b74af..1f3040a93f 100644 --- a/configure.in +++ b/configure.in @@ -7,6 +7,7 @@ AC_INIT # Bootstrap StepMake configure # For user package: AC_CONFIG_AUX_DIR([stepmake/bin]) + # For stepmake package: # AC_CONFIG_AUX_DIR(bin) @@ -21,22 +22,75 @@ AC_CONFIG_HEADER([$CONFIGFILE.hh:config.hh.in]) # Uncomment the configuration options your package needs. +DOCUMENTATION=yes +AC_ARG_ENABLE(documentation, + [ --enable-documentation build Documentation. Default: on], + [DOCUMENTATION=$enableval]) +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]) + +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]) + +LINK_GXX_STATICALLY=no +AC_ARG_ENABLE(static-gxx, + [ --enable-static-gxx link libstdc++.a statically. Default: off], + [LINK_GXX_STATICALLY=$enableval]) +AC_SUBST(LINK_GXX_STATICALLY) + # must come before any header checks STEPMAKE_COMPILE -STEPMAKE_KPATHSEA +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_PYTHON(REQUIRED, 2.1) -STEPMAKE_GCC(REQUIRED, 2.8) 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. @@ -44,24 +98,46 @@ STEPMAKE_DLOPEN STEPMAKE_BISON(OPTIONAL, 1.29) STEPMAKE_FLEX(REQUIRED) STEPMAKE_FLEXLEXER(REQUIRED) +STEPMAKE_FLEXLEXER_LOCATION AC_LANG_C STEPMAKE_LOCALE 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.14) +STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15) + +STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624) -STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.1) -STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208) +STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED) -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 @@ -71,45 +147,45 @@ AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8") AC_SEARCH_LIBS(mbrtowc, [mingwex msvcp60]) STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0) + if test "$gui_b" = "yes"; then STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0) -fi # $gui_b +fi + +if test "$reloc_b" = "yes"; then + AC_DEFINE(ARGV0_RELOCATION) +fi + + +HOST_ARCH=`$CC -dumpmachine` +AC_SUBST(HOST_ARCH) -STEPMAKE_FREETYPE2(freetype2, REQUIRED, 0) -#STEPMAKE_PANGO(pango, REQUIRED, 1.6.0) STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0) -STEPMAKE_FONTCONFIG(fontconfig, OPTIONAL, 2.2.0) +#STEPMAKE_PANGO(pango, REQUIRED, 1.6.0) +STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0) +STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10) -## TTFTOOL stuff -AC_C_BIGENDIAN(TTFTOOL_ENDIAN="-DBIGENDIAN", - TTFTOOL_ENDIAN="-DSMALLENDIAN") -AC_SUBST(TTFTOOL_ENDIAN) +STEPMAKE_WINDOWS ## Optional tools for building documentation, website, extra fonts. # guile executable for some scripts 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) +STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11) +AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") -if test "$optimise_b" = yes; then - DEFINES="$DEFINES -DSTRING_UTILS_INLINED" - AC_DEFINE(STRINGS_UTILS_INLINED) -fi -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 - test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc="" cat <