From: Werner Lemberg Date: Sun, 27 Jan 2013 08:59:36 +0000 (+0100) Subject: s/configure.in/configure.ac/ X-Git-Tag: release/2.17.12-1~21 X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=d0ab50f4a92f410b22f015b4f05104c4f23bc3c7 s/configure.in/configure.ac/ Future autoconf versions will no longer support `configure.in'. --- diff --git a/aclocal.m4 b/aclocal.m4 index 0dcd5bd870..4d5710ba9e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,5 +1,5 @@ dnl aclocal.m4 -*-shell-script-*- -dnl StepMake subroutines for configure.in +dnl StepMake subroutines for configure.ac ### mostly interal macros @@ -140,7 +140,7 @@ AC_DEFUN(STEPMAKE_CHECK_VERSION_UNSUPPORTED, [ fi ]) -### Macros to build configure.in +### Macros to build configure.ac AC_DEFUN(STEPMAKE_BIBTEX2HTML, [ diff --git a/autogen.sh b/autogen.sh index 9d21f79936..46dd22f98b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,7 +7,7 @@ case $1 in --noconf*) NOCONFIGURE=true;; esac -for i in $srcdir/configure.in #`find $srcdir -name configure.in -print` +for i in $srcdir/configure.ac #`find $srcdir -name configure.ac -print` do dir=`dirname $i` echo processing $dir diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000000..2ae2f6cbb9 --- /dev/null +++ b/configure.ac @@ -0,0 +1,282 @@ +dnl configure.ac -*-shell-script-*- +dnl Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.60) + +# Bootstrap the init process. +AC_INIT + +# Bootstrap StepMake configure +AC_CONFIG_AUX_DIR([config]) + +STEPMAKE_INIT + +# List a file that identifies your package. +AC_CONFIG_SRCDIR([lily/main.cc]) + +# Move to aclocal.m4? +AC_CONFIG_HEADERS([$CONFIGFILE.hh:config.hh.in]) + +# Uncomment the configuration options your package needs. + +DOCUMENTATION=yes +AC_ARG_ENABLE(documentation, + [AS_HELP_STRING([--enable-documentation], + [build Documentation. Default: on])], + [DOCUMENTATION=$enableval]) +AC_SUBST(DOCUMENTATION) + +AC_ARG_WITH(ncsb-dir, + [AS_HELP_STRING([--with-ncsb-dir=DIR], + [location of Century Schoolbook fonts.])], + [NCSB_DIR=$withval], + [NCSB_DIR=""]) + +reloc_b=no +AC_ARG_ENABLE(relocation, + [AS_HELP_STRING([--enable-relocation], + [compile with dynamic relocation. Default: off])], + [reloc_b=$enableval]) + +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, + [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(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 + 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 + UNCHECKED_NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $UNCHECKED_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/\(:.*\)$//g'` + NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE` + 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) +# 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_OR_CLANG(REQUIRED, 3.4) +STEPMAKE_GXXCODEGENBUG +STEPMAKE_CXXTEMPLATE +STEPMAKE_STL_DATA_METHOD +STEPMAKE_LIB(REQUIRED) +STEPMAKE_DLOPEN +# Do not use bison 1.50 and 1.75. +# 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 +STEPMAKE_LOCALE +STEPMAKE_GETTEXT +STEPMAKE_MSGFMT(REQUIRED) +STEPMAKE_TEXMF(REQUIRED) +STEPMAKE_TEXMF_DIRS +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 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" +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(FONTFORGE, fontforge, REQUIRED, 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_CHECK_HEADERS([sstream]) +AC_HEADER_STAT +AC_FUNC_MEMCMP +AC_FUNC_VPRINTF +AC_CHECK_FUNCS([chroot fopencookie gettext isinf memmem snprintf vsnprintf]) + +STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0) + +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_FONTCONFIG(fontconfig, REQUIRED, 2.4.0) +STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10) + +STEPMAKE_WINDOWS + +# 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, $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}") + +# 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 <]) -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" -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(FONTFORGE, fontforge, REQUIRED, 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_CHECK_HEADERS([sstream]) -AC_HEADER_STAT -AC_FUNC_MEMCMP -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([chroot fopencookie gettext isinf memmem snprintf vsnprintf]) - -STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0) - -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_FONTCONFIG(fontconfig, REQUIRED, 2.4.0) -STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10) - -STEPMAKE_WINDOWS - -# 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, $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}") - -# 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 < $CHECKSUM_FILE - diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index f216898fe8..1b998b938d 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -95,7 +95,7 @@ $(outdir)/version.hh: $(depth)/VERSION $(config_make) $(top-src-dir)/scripts/bui $(outdir)/config.hh: $(config_h) cp -p $< $@ -configure: configure.in aclocal.m4 +configure: configure.ac aclocal.m4 NOCONFIGURE=yes $(src-depth)/autogen.sh chmod +x configure