X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=954db04cadbe844acba4d4c0512a62faa03a989c;hb=180b2b44d88000f51093c1a989caa000c8057379;hp=f41aef700ad338f4068b13f9d6850d506f7bafaf;hpb=1c122290caffd067b81c60a18c97e61d1c6b209e;p=lilypond.git diff --git a/configure.in b/configure.in index f41aef700a..954db04cad 100644 --- a/configure.in +++ b/configure.in @@ -3,16 +3,11 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -# Bootstrap the init proces. +# Bootstrap the init process. AC_INIT # Bootstrap StepMake configure -# For user package: -AC_CONFIG_AUX_DIR([stepmake/bin]) - -# For stepmake package: -# AC_CONFIG_AUX_DIR(bin) - +AC_CONFIG_AUX_DIR([config]) STEPMAKE_INIT @@ -62,13 +57,14 @@ STEPMAKE_COMPILE AC_CHECK_PROG(FCLIST, fc-list, fc-list) AC_MSG_CHECKING([New Century Schoolbook PFB files]) AC_SUBST(NCSB_SOURCE_FILES) +AC_SUBST(NCSB_DIR) +UNCHECKED_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" + UNCHECKED_NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $UNCHECKED_NCSB_SOURCE_FILES" fi done else @@ -76,25 +72,41 @@ else 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=`echo $NCSB_FILE | sed 's/\(:.*\)$//g'` NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE` - NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES" + UNCHECKED_NCSB_SOURCE_FILES="$NCSB_FILE $UNCHECKED_NCSB_SOURCE_FILES" done + NCSB_DIR=`AS_DIRNAME($NCSB_FILE)` else AC_MSG_RESULT(not found) echo "Can't find Century Schoolbook files. Install FontConfig's fc-list," echo "or use --with-ncsb-dir" + STEPMAKE_ADD_ENTRY(REQUIRED,International New Century Schoolbook fonts) fi fi +NCSB_SOURCE_FILES="" +for f in $UNCHECKED_NCSB_SOURCE_FILES; do + if test "`grep Cyrillic "$f"`" = ""; then + STEPMAKE_WARN($f does not have Cyrillic characters.) + STEPMAKE_ADD_ENTRY(REQUIRED,International New Century Schoolbook fonts) + else + NCSB_SOURCE_FILES="$f $NCSB_SOURCE_FILES" + fi +done AC_MSG_RESULT($NCSB_SOURCE_FILES) AC_LANG([C++]) STEPMAKE_PYTHON(REQUIRED, 2.4) -STEPMAKE_GCC(REQUIRED, 3.4) +# this checks if we have GNU C by compiling a program with +# __GNUC__, but that macro now unofficially means "the compiler +# supports the GNU C extensions" -- the intel C compiler and clang +# both support __GNUC__! +STEPMAKE_GCC_OR_CLANG(REQUIRED, 3.4) STEPMAKE_CXX(REQUIRED) -STEPMAKE_GXX(REQUIRED, 3.4) +STEPMAKE_GXX_OR_CLANG(REQUIRED, 3.4) +STEPMAKE_GXXCODEGENBUG STEPMAKE_CXXTEMPLATE STEPMAKE_STL_DATA_METHOD STEPMAKE_LIB(REQUIRED) @@ -112,14 +124,35 @@ STEPMAKE_TEXMF(REQUIRED) STEPMAKE_TEXMF_DIRS STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2) -# check for 2 typedefs added in Guile 1.9 +# 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 for usable cxxabi +save_LIBS="$LIBS" +LIBS="$LIBS $CXXABI_LIBS" +AC_MSG_CHECKING(for usable C++ demangler) +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [abi::__cxa_demangle ("", 0, 0, 0)])], + [AC_DEFINE(HAVE_CXA_DEMANGLE) + AC_MSG_RESULT(yes)],[ + LIBS="$LIBS -lsupc++" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [abi::__cxa_demangle ("", 0, 0, 0)])], + [AC_DEFINE(HAVE_CXA_DEMANGLE) + AC_MSG_RESULT([yes, using -lsupc++]) + CXXABI_LIBS="$CXXABI_LIBS -lsupc++"], + [AC_MSG_RESULT([no, use c++filt -t for manual demangling])])]) +LIBS="$save_LIBS" +AC_SUBST(CXXABI_LIBS) + ## check rational bugfix. save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS" @@ -135,12 +168,7 @@ CPPFLAGS="$save_CPPFLAGS" STEPMAKE_PYTHON_DEVEL(REQUIRED) -STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.60) - -STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624) -# For svg woff fonts to work, version 20100501 is required but -# the build does not break; leave optional until distros ship it. -STEPMAKE_PATH_PROG(FONTFORGE, fontforge, OPTIONAL, 20100501) +STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222) STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED) @@ -176,18 +204,51 @@ STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10) STEPMAKE_WINDOWS -## Optional tools for building documentation, website, extra fonts. - # guile executable for some scripts STEPMAKE_GUILE(OPTIONAL) # perl for help2man. STEPMAKE_PERL(OPTIONAL) +## Optional tools for building documentation, website, extra fonts. +if test "$DOCUMENTATION" = "yes"; then + DOCUMENTATION_REQUIRED=REQUIRED +else + DOCUMENTATION_REQUIRED=OPTIONAL +fi + +STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, $DOCUMENTATION_REQUIRED, 8.60) + 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(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82) +STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4) +STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(PDFLATEX, pdflatex, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(PDFTEX, pdfetex pdftex etex, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(TEXI2PDF, texi2pdf, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(TEXINDEX, texindex, $DOCUMENTATION_REQUIRED) +AC_MSG_CHECKING(for epsf.tex) +TEX_EPSF=`kpsewhich tex epsf` +if test "$TEX_EPSF" = ""; then + AC_MSG_RESULT(not found) + STEPMAKE_ADD_ENTRY($DOCUMENTATION_REQUIRED,epsf.tex) +else + AC_MSG_RESULT($TEX_EPSF) +fi +AC_MSG_CHECKING(for Cyrillic characters support in TeX) +TEX_FIKPARM=`kpsewhich -format=mf fikparm` +if test "$TEX_FIKPARM" = ""; then + AC_MSG_RESULT(not found) + STEPMAKE_ADD_ENTRY($DOCUMENTATION_REQUIRED, +['lh CTAN package (texlive-lang-cyrillic or texlive-texmf-fonts)']) +else + AC_MSG_RESULT(yes) +fi +STEPMAKE_PROGS(NETPBM, pngtopnm, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(IMAGEMAGICK, convert, $DOCUMENTATION_REQUIRED) +# this name avoids a conflict with ZIP in stepmake/aclocal.m4 +STEPMAKE_PROGS(ZIPDOC, zip, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(RSYNC, rsync, $DOCUMENTATION_REQUIRED) AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")