X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=92e53a0515b60248432b49ee6b306dee702a322c;hb=5436a1f9029bb897638670d25da1422a85431bae;hp=64daff2952767ae88e19f0e36c8e1c934ab5c875;hpb=e4618182fba1d30ebee77c829fd43ad9aefcd8a7;p=lilypond.git diff --git a/configure.in b/configure.in index 64daff2952..92e53a0515 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,109 +22,139 @@ 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]) + +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]) + +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_PYTHON(REQUIRED,2.1) +STEPMAKE_PYTHON(REQUIRED, 2.2) STEPMAKE_GCC(REQUIRED, 2.8) STEPMAKE_CXX(REQUIRED) STEPMAKE_GXX(REQUIRED, 3.0.5) STEPMAKE_CXXTEMPLATE +STEPMAKE_STL_DATA_METHOD STEPMAKE_LIB(REQUIRED) +STEPMAKE_DLOPEN # Do not use bison 1.50 and 1.75. -STEPMAKE_BISON(REQUIRED, 1.25) +# 1.29 is required fr %locations, but I'm not sure it's enough --ns +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) -STEPMAKE_KPATHSEA +STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.5) STEPMAKE_MAKEINFO(REQUIRED) STEPMAKE_PYTHON_DEVEL(REQUIRED) -# mftrace for generating pfa's, pfb's -STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.1) - -# mftrace for generating pfa's, pfb's -STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208) +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 sys/stat.h]) +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_LANG_POP(C++) AC_HEADER_STAT AC_FUNC_MEMCMP AC_FUNC_VPRINTF -AC_CHECK_FUNCS([gettext isinf memmem snprintf vsnprintf gettext]) - -AC_MSG_CHECKING([for ec-fonts-mftraced]) -ecb10=`kpsewhich ecb10.pfa 2>/dev/null` -if test -n "$ecb10"; then - AC_MSG_RESULT([$ecb10]) -else - AC_MSG_RESULT(no) - AC_MSG_CHECKING([for lmodern]) - lmr10=`kpsewhich lmr10.pfb 2>/dev/null` - if test -n "$lmr10"; then - AC_MSG_RESULT([$lmr10]) - else - STEPMAKE_ADD_ENTRY(REQUIRED, 'package ec-fonts-mftraced >= 1.0.5') - AC_MSG_CHECKING([for old version of ec-fonts-mftraced]) - ecrm10=`kpsewhich ecrm10.pfa 2>/dev/null` - if test -n "$ecrm10"; then - AC_MSG_RESULT([$ecrm10]) - AC_MSG_WARN([old version of ec-fonts-mftraced found, install 1.0.5 or newer]) - fi - fi -fi +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]) + +STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0) if test "$gui_b" = "yes"; then - STEPMAKE_GTK2 + STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0) +fi + +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 -STEPMAKE_FREETYPE2 -STEPMAKE_PANGO_FT2 +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_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. +# makeinfo--but hopefully won't report makeinfo problems. STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7) -AC_SUBST(MAKEINFO_VERSION) - -if test "$optimise_b" = yes; then - DEFINES="$DEFINES -DSTRING_UTILS_INLINED" - AC_DEFINE(STRINGS_UTILS_INLINED) -fi - -AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") # Gather requirements and generate output. STEPMAKE_END - test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc="" cat <