X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=cf0178f457b5c3ac0e0971ebe23617f2aacc0584;hb=refs%2Fheads%2Fbugs%2F567849;hp=d5b9bf540079d581f33206d3144a07a29579ef35;hpb=3af2bf4ef314f540a53832c6651e6c56333a37d1;p=lilypond.git diff --git a/configure.in b/configure.in index d5b9bf5400..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,47 +20,46 @@ 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]) - - AC_ARG_WITH(ncsb-dir, - [ --with-ncsb-dir=DIR location of Century Schoolbook fonts.], + [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]) rpath_b=no AC_ARG_ENABLE(rpath, - [ --enable-rpath hardcode runtime library path. Default: off], + [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 -AC_CHECK_PROG(FCMATCH, fc-match, fc-match) +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 @@ -71,23 +72,23 @@ if test "$NCSB_DIR" != "" ; then fi done else - if test "$FCMATCH" != ""; then + if test "$FCLIST" != ""; 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_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-match," + 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) @@ -104,58 +105,55 @@ 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 - -## should check for 1.8.2 ? -STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.0) - +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_TRY_CPP( -#include +AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include #ifdef SCM_FRACTION_REDUCED_BIT -#error +#error #endif -, -AC_MSG_RESULT(ok), -REQUIRED="$REQUIRED GUILE-with-rational-bugfix" -AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt)) +]])],[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_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624) +STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20100501) +STEPMAKE_PATH_PROG(FONTFORGE, fontforge, OPTIONAL, 20110222) 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 boost/lambda/lambda.hpp]) -AC_LANG_POP(C++) +AC_CHECK_HEADERS([sstream]) 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) @@ -164,7 +162,7 @@ AC_MSG_RESULT($reloc_b) AC_MSG_CHECKING(for rpath linkage) if test "$rpath_b" = "yes"; then - LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,\\\$\$ORIGIN" + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,\\\$\$ORIGIN/../lib" elif test "$rpath_b" != "no"; then LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,$rpath_b" fi @@ -174,8 +172,7 @@ 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_FONTCONFIG(fontconfig, REQUIRED, 2.4.0) STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10) STEPMAKE_WINDOWS @@ -189,7 +186,15 @@ STEPMAKE_GUILE(OPTIONAL) STEPMAKE_PERL(OPTIONAL) STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11) -STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.79) +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) + AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") @@ -205,6 +210,11 @@ 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 <