X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=6253b66efd53e9c1f7032e9d0e7d0a5825b06a2d;hb=d98ccb8e9a3793207cacd4b83d6034458299bb88;hp=fa4569390876e4bb02c60df92f8496f99bbab6a2;hpb=3bca582c97181b5936c639ff87e1caffdc78c1bd;p=lilypond.git diff --git a/configure.in b/configure.in index fa45693908..6253b66efd 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) @@ -29,14 +30,25 @@ 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]) +rpath_b=no +AC_ARG_ENABLE(rpath, + [ --enable-rpath hardcode runtime library path. Default: off], + [rpath_b=$enableval]) + LINK_GXX_STATICALLY=no AC_ARG_ENABLE(static-gxx, [ --enable-static-gxx link libstdc++.a statically. Default: off], @@ -46,13 +58,44 @@ AC_SUBST(LINK_GXX_STATICALLY) # must come before any header checks STEPMAKE_COMPILE -STEPMAKE_KPATHSEA +AC_CHECK_PROG(FCLIST, fc-list, fc-list) +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 + STEPMAKE_WARN($NCSB_DIR does not contain $f.pfb.) + else + NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $NCSB_SOURCE_FILES" + fi + done +else + if test "$FCLIST" != ""; then + for style in Roman Italic "Bold Italic" Bold; do + NCSB_FILE=`$FCLIST "Century Schoolbook L:style=$style:foundry=urw:fontformat=Type 1" file \ + | head -n 1` + NCSB_FILE=`echo $NCSB_FILE | sed 's/^\(.*\):$/\1/g'` + NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/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-list," + 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.2) -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. @@ -67,25 +110,43 @@ 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_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]) +STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED) + +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 AC_FUNC_VPRINTF -AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf mbrtowc memmem snprintf vsnprintf wcrtomb]) -AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8") -AC_SEARCH_LIBS(mbrtowc, [mingwex msvcp60]) +AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf memmem snprintf vsnprintf wcrtomb]) STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0) @@ -93,14 +154,27 @@ if test "$gui_b" = "yes"; then STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0) fi +AC_MSG_CHECKING(whether to enable dynamic relocation) if test "$reloc_b" = "yes"; then AC_DEFINE(ARGV0_RELOCATION) fi +AC_MSG_RESULT($reloc_b) + +AC_MSG_CHECKING(for rpath linkage) +if test "$rpath_b" = "yes"; then + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,\\\$\$ORIGIN/../lib" +elif test "$rpath_b" != "no"; then + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,$rpath_b" +fi +AC_MSG_RESULT($rpath_b) + +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 @@ -112,24 +186,28 @@ 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, OPTIONAL, 1.82) AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") +# must also have local.make if configure fails. +touch local.make + +if test "$reloc_b$rpath_b" = "yesno"; then + STEPMAKE_WARN([Using --enable-relocation without --enable-rpath. LilyPond may have trouble finding libraries.]) +fi + # Gather requirements and generate output. STEPMAKE_END test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc="" +if make top-doc 1>/dev/null 2>&1; then + rm -f INSTALL.txt && ln Documentation/topdocs/out/INSTALL.txt . + rm -f README.txt && ln Documentation/topdocs/out/README.txt . +fi + cat <