X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=aclocal.m4;h=724a91b40b7265b18cf05aa870ad088ec47310a6;hb=531fb17b5a9c48e8b86d62b269cb83aa3cb419db;hp=00a23fdb1948e6eda4edf0165dbc41aaa3425c29;hpb=6b6a34e929bf1d5a8859fe77e66396c3c15ef37c;p=lilypond.git diff --git a/aclocal.m4 b/aclocal.m4 index 00a23fdb19..724a91b40b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -76,6 +76,7 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ CFLAGS="$CFLAGS $OPTIMIZE" CPPFLAGS=${CPPFLAGS:-""} + AC_SUBST(cross_compiling) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) @@ -154,7 +155,7 @@ AC_DEFUN(AC_STEPMAKE_GXX, [ then true else - AC_STEPMAKE_WARN(can\'t find g++ 2.8 or egcs 1.1) + AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9 or egcs 1.1) fi ]) @@ -177,9 +178,15 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ fi AC_MSG_CHECKING("Guile version") need_guile_version="1.3.4" - guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"` + need_guile_version_numeric=100304 + guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` + guile_version_numeric=`echo $guile_version | awk -F. ' +{if ([$]3) {last = [$]3} +else {last =0}} +{printf "%s%s%s\n",[$]1*100, [$]2*10,last}'` AC_MSG_RESULT("$guile_version") - if test "$guile_version" != "$need_guile_version"; then + if test $guile_version_numeric -lt $need_guile_version_numeric + then AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed") fi GUILE_FLAGS @@ -292,12 +299,6 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ AUTOGENERATE="This file was automatically generated by configure" AC_SUBST(AUTOGENERATE) - STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null` - if test "x$STATE_VECTOR" != "x"; then - STATE_VECTOR="\$(depth)/$STATE_VECTOR" - fi - AC_SUBST(STATE_VECTOR) - CONFIGSUFFIX= AC_ARG_ENABLE(config, [ enable-config=FILE put configure settings in config-FILE.make], @@ -395,6 +396,34 @@ dnl fi AC_STEPMAKE_DATADIR ]) +AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ + + kpathsea_b=yes + AC_ARG_ENABLE(kpathsea, + [ enable-kpathsea use kpathsea lib. Default: on], + [kpathsea_b=$enableval]) + + if test $kpathsea_b = yes; then + AC_HAVE_HEADERS(kpathsea/kpathsea.h) + AC_CHECK_LIB(kpathsea, kpse_find_file) + # urg: kpse_find_tfm is a #define, how to check for this? + # AC_CHECK_LIB(kpathsea, kpse_find_tfm) + # AC_CHECK_FUNCS(kpse_find_file kpse_find_tfm,, AC_STEPMAKE_WARN(Cannot find kpathsea functions. You may have to create TFM files manually.)) + AC_CHECK_FUNCS(kpse_find_file,, AC_STEPMAKE_WARN(Cannot find kpathsea functions. You may have to create TFM files manually.) kpathsea_b=no) + fi + AC_MSG_CHECKING(whether to use kpathsea) + if test $kpathsea_b = yes; then + AC_MSG_RESULT(yes) + KPATHSEA=1 + else + AC_MSG_RESULT(no) + KPATHSEA=0 + fi + + AC_SUBST(KPATHSEA) + AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA) +]) + AC_DEFUN(AC_STEPMAKE_LEXYACC, [ # ugh, automake: we want (and check for) bison AC_PROG_YACC @@ -522,7 +551,7 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [ #why has this been dropped? AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [ AC_ARG_ENABLE(tex-prefix, - [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. (default: PREFIX)], + [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. Default: PREFIX], [TEXPREFIX=$enableval], [TEXPREFIX=auto] ) @@ -555,26 +584,33 @@ AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [ ]) AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ - AC_ARG_ENABLE(tex-tfmdir, - [ enable-tex-tfmdir=DIR set the tex-directory where cmr10.tfm lives (default: use kpsewhich)], - [TFMDIR=$enableval], - [TFMDIR=auto] ) + AC_ARG_ENABLE(tfm-path, + [ enable-tfm-path=PATH set path of tex directories where tfm files live, esp.: cmr10.tfm. Default: use kpsewhich], + [tfm_path=$enableval], + [tfm_path=auto] ) AC_CHECK_PROGS(KPSEWHICH, kpsewhich, no) - AC_MSG_CHECKING(for TeX TFM directory) - if test "x$TFMDIR" = xauto ; then - if test "x$TEX_TFMDIR" = "x" ; then - if test "x$KPSEWHICH" != "xno" ; then - CMR10=`kpsewhich tfm cmr10.tfm` - TEX_TFMDIR=`dirname $CMR10` - else - AC_STEPMAKE_WARN(Please set TEX_TFMDIR (to where cmr10.tfm lives): - TEX_TFMDIR=/usr/local/TeX/lib/tex/fonts ./configure) - fi + AC_MSG_CHECKING(for tfm path) + + TFM_FONTS="cmr msam" + + if test "x$tfm_path" = xauto ; then + if test "x$KPSEWHICH" != "xno" ; then + for i in $TFM_FONTS; do + dir=`$KPSEWHICH tfm ${i}10.tfm` + TFM_PATH="$TFM_PATH `dirname $dir`" + done + else + AC_STEPMAKE_WARN(Please specify where cmr10.tfm lives: + ./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts) fi + else + TFM_PATH=$tfm_path fi - AC_MSG_RESULT($TEX_TFMDIR) - AC_SUBST(TEX_TFMDIR) + + TFM_PATH=`echo $TFM_PATH | tr ':' ' '` + AC_MSG_RESULT($TFM_PATH) + AC_SUBST(TFM_PATH) ]) AC_DEFUN(AC_STEPMAKE_TEXMF, [ @@ -613,20 +649,24 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ break; fi done + AC_MSG_RESULT($MFMODE) + AC_MSG_CHECKING(for mfplain.mp) # # For now let people define these in their environments # : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`} + AC_MSG_RESULT($MFPLAIN_MP) + AC_MSG_CHECKING(for inimetapost flags) if test ${INIMETAPOST} = "inimp" ; then : ${INIMETAPOST_FLAGS=''} else : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'} fi + AC_MSG_RESULT($INIMETAPOST_FLAGS) rm -f mfput.* - AC_MSG_RESULT($MFMODE) AC_SUBST(METAFONT) AC_SUBST(METAPOST) @@ -694,7 +734,7 @@ AC_DEFUN(AC_TEX_PREFIX, [ if test "x$find_texpostfix" = x; then find_texpostfix='/lib/texmf/tex' - AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix) + AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix) fi find_texprefix="$find_root_prefix/$find_texpostfix" @@ -722,7 +762,7 @@ AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [ if test "x$find_dirdir" = x; then find_dirdir="/$3"; - AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line) + AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line) true fi $2=$find_dirdir