X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=cf0178f457b5c3ac0e0971ebe23617f2aacc0584;hb=refs%2Fheads%2Fbugs%2F567849;hp=94d02af55d94c09bd25ce6030f47478d61e29347;hpb=065d15a53e3a341c4ad0fc141a6bc20afef5e481;p=lilypond.git diff --git a/configure.in b/configure.in index 94d02af55d..cf0178f457 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,7 @@ dnl configure.in -*-shell-script-*- -dnl Process this file with autoconf to produce a configure script. +dnl Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.60) # Bootstrap the init proces. AC_INIT @@ -18,62 +20,81 @@ STEPMAKE_INIT AC_CONFIG_SRCDIR([lily/main.cc]) # Move to aclocal.m4? -AC_CONFIG_HEADER([$CONFIGFILE.hh:config.hh.in]) +AC_CONFIG_HEADERS([$CONFIGFILE.hh:config.hh.in]) # Uncomment the configuration options your package needs. DOCUMENTATION=yes AC_ARG_ENABLE(documentation, - [ --enable-documentation build Documentation. Default: on], + [AS_HELP_STRING([--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. 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]) - + [AS_HELP_STRING([--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], + [AS_HELP_STRING([--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}"]) +rpath_b=no +AC_ARG_ENABLE(rpath, + [AS_HELP_STRING([--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], + [AS_HELP_STRING([--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.2) -STEPMAKE_GCC(REQUIRED, 2.8) +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) + +AC_LANG([C++]) + +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) @@ -84,68 +105,75 @@ 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) +STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2) + +# check for 3 typedefs added in Guile 1.9 +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$GUILE_CFLAGS $CXXFLAGS" +AC_CHECK_TYPES([scm_t_hash_fold_fn, scm_t_hash_handle_fn], + [AC_DEFINE(HAVE_GUILE_HASH_FUNC)], [], + [#include ]) +AC_CHECK_TYPES([scm_t_subr], + [AC_DEFINE(HAVE_GUILE_SUBR_TYPE)], [], + [#include ]) +CXXFLAGS="$save_CXXFLAGS" + +## check rational bugfix. +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS" +AC_MSG_CHECKING(GUILE rational bugfix) +AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#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_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.60) -STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.9) -STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624) +STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20100501) +STEPMAKE_PATH_PROG(FONTFORGE, fontforge, OPTIONAL, 20110222) -AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h]) -AC_LANG_PUSH(C++) +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_CHECK_HEADERS([sstream]) -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 gettext isinf memmem snprintf vsnprintf]) 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 - +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([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 +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) -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_FONTCONFIG(fontconfig, REQUIRED, 2.4.0) +STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10) STEPMAKE_WINDOWS @@ -157,24 +185,36 @@ 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) +STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.82) +STEPMAKE_PROGS(DBLATEX, dblatex, OPTIONAL) +STEPMAKE_PROGS(PDFLATEX, pdflatex, OPTIONAL) +STEPMAKE_PROGS(NETPBM, pngtopnm, OPTIONAL) +STEPMAKE_PROGS(IMAGEMAGICK, convert, OPTIONAL) +# this name avoids a conflict with ZIP in stepmake/aclocal.m4 +STEPMAKE_PROGS(ZIPDOC, zip, OPTIONAL) +STEPMAKE_PROGS(RSYNC, rsync, OPTIONAL) -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 + +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 <