X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=caee78ed689c2ec3ef1c521d12b1712ad6bc8c1c;hb=8766d90306918dedc640ae86b0693efc6cb989df;hp=ff8f808a82f287a41b7bf939ad10ad4871a6e07c;hpb=722ce7fa655c28f9e5a7d75eb6a28f4d212be13b;p=lilypond.git diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index ff8f808a82..caee78ed68 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,3 +1,9 @@ +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -77,7 +83,9 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ LD='$(CC)' AC_SUBST(LD) + CFLAGS="$CFLAGS $OPTIMIZE" CPPFLAGS=${CPPFLAGS:-""} + AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(ICFLAGS) @@ -142,14 +150,32 @@ AC_DEFUN(AC_STEPMAKE_END, [ AC_DEFUN(AC_STEPMAKE_GXX, [ # ugh autoconf + # urg, egcs: how to check for egcs >= 1.1? changequote(<<, >>)dnl - if $CXX --version | grep '2\.[78]' > /dev/null || + if $CXX --version | grep '2\.8' > /dev/null || $CXX --version | grep 'egcs' > /dev/null changequote([, ])dnl then true else - AC_STEPMAKE_WARN(can\'t find g++ 2.7, 2.8 or egcs) + AC_STEPMAKE_WARN(can\'t find g++ 2.8 or egcs 1.1) + fi +]) + +AC_DEFUN(AC_STEPMAKE_GUILE, [ + # on some systems, -lguile succeeds for guile-1.3 + # others need readline, dl (or even more) + # urg, must check for different functions in libguile + # to force new check iso reading from cache + + # gh_scm2doubles,gh_doubles2scm are new in 1.3 + GUILE_FLAGS + AC_CHECK_LIB(guile, gh_scm2doubles, + [LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[/-_a-zA-Z0-9]]\+ //g'` $LIBS" + AC_DEFINE(HAVE_LIBGUILE)], , $GUILE_LDFLAGS dnl + ) + if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then + AC_STEPMAKE_WARN(You should install guile 1.3 or newer) fi ]) @@ -167,23 +193,58 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` changequote([, ])dnl + # No versioning on directory names of sub-packages + # urg, urg + stepmake=${datadir}/stepmake + presome=${prefix} + if test "$prefix" = "NONE"; then + presome=${ac_default_prefix} + fi + stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"` + + AC_MSG_CHECKING(Package) if test "x$PACKAGE" = "xSTEPMAKE"; then - echo Stepmake package! + AC_MSG_RESULT(Stepmake package!) (cd stepmake; rm -f stepmake; ln -s ../stepmake .) (cd stepmake; rm -f bin; ln -s ../bin .) AC_CONFIG_AUX_DIR(bin) + stepmake=stepmake else - echo Package: $PACKAGE - AC_CONFIG_AUX_DIR(stepmake/bin) + AC_MSG_RESULT($PACKAGE) + AC_MSG_CHECKING(for stepmake) + # Check for installed stepmake + if test -d $stepmake; then + AC_MSG_RESULT($stepmake) + else + stepmake='$(depth)'/stepmake + AC_MSG_RESULT(./stepmake ($datadir/stepmake not found)) + fi + AC_CONFIG_AUX_DIR(\ + $HOME/usr/local/share/stepmake/bin\ + $HOME/usr/local/lib/stepmake/bin\ + $HOME/usr/share/stepmake/bin\ + $HOME/usr/lib/stepmake/bin\ + /usr/local/share/stepmake/bin\ + /usr/local/lib/stepmake/bin\ + /usr/share/stepmake/bin\ + /usr/lib/stepmake/bin\ + stepmake/bin\ + ) fi + AC_SUBST(stepmake) AC_SUBST(package) AC_SUBST(PACKAGE) AC_SUBST(PACKAGE_NAME) AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}") AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") - package_depth=`dirname $cache_file` + if test "$package_depth" = "" ; then + package_depth="." + else + package_depth="../$package_depth" + fi + export package_depth AC_SUBST(package_depth) AUTOGENERATE="This file was automatically generated by configure" @@ -191,10 +252,6 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ absolute_builddir="`pwd`" AC_SUBST(absolute_builddir) - # No versioning on directory names of sub-packages - stepmake=stepmake - AC_SUBST(stepmake) - STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null` if test "x$STATE_VECTOR" != "x"; then STATE_VECTOR="\$(depth)/$STATE_VECTOR" @@ -214,10 +271,9 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ AC_SUBST(CONFIGSUFFIX) AC_CANONICAL_HOST - AC_CHECK_PROGS(MAKE, make, error) + AC_CHECK_PROGS(MAKE, gmake make, error) AC_CHECK_PROGS(FIND, find, error) - dnl system supplied INSTALL is unsafe; use our own install. dnl AC_PROG_INSTALL dnl if test "$INSTALL" = "bin/install-sh"; then @@ -225,38 +281,69 @@ dnl export INSTALL="\$\(depth\)/bin/install-sh" dnl fi AC_CHECK_PROGS(TAR, tar, error) - AC_CHECK_PROGS(BASH, bash, /bin/sh) + + if test "x`uname`" = "xHP-UX"; then + AC_PATH_PROG(BASH, bash, /bin/sh) + AC_STEPMAKE_WARN(avoiding buggy /bin/sh) + AC_PATH_PROG(SHELL, bash, /bin/ksh) + else + AC_PATH_PROG(BASH, bash, /bin/sh) + SHELL=/bin/sh + AC_SUBST(SHELL) + fi + AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python) AC_SUBST(PYTHON) - - AC_CHECK_SEARCH_RESULT($MAKE, GNU make, You should install GNU make) if test $MAKE != "error" ; then - $MAKE -v| grep GNU > /dev/null + $MAKE -v 2> /dev/null | grep GNU > /dev/null if test "$?" = 1 then AC_STEPMAKE_WARN(Please install *GNU* make) - fi + fi fi AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then LN=cp # hard link does not work under cygnus-nt - LN_S=cp # symbolic link does not work for native nt + LN_S='cp -r' # symbolic link does not work for native nt ZIP="zip -r -9" # DOTEXE=.exe - DIRSEP='\\' - PATHSEP=';' - INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c" + # urg + # DIRSEP='\\' + # PATHSEP=';' + # + # cygwin fixes all these things. + # it seems these were used because of dos-style TEXINPUTS and + # MFINPUTS needed for miktex. + # but this breaks parsing of all other cygwin/unix style paths. + # + # if your (mik)tex breaks, make a: + # /usr/local/bin/tex: + # #!/bin/sh + # TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex $* + # + # and + # + # /usr/local/bin/mf: + # #!/bin/sh + # MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf $* + # + # this way, you may have buildscripts/out/lilypond-profile + # 'automatically' sourced from /usr/etc/profile.d/ too. + # + DIRSEP='/' + PATHSEP=':' + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else DIRSEP='/' PATHSEP=':' LN=ln LN_S='ln -s' ZIP="zip -r -9" - INSTALL="\$(stepdir)/../bin/install-sh -c" + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" fi AC_SUBST(DOTEXE) AC_SUBST(ZIP) @@ -285,12 +372,12 @@ AC_DEFUN(AC_STEPMAKE_LEXYACC, [ AC_CHECK_PROGS(BISON, bison, error) AC_CHECK_PROGS(FLEX, flex, error) - AC_CHECK_SEARCH_RESULT($BISON, bison, Please install Bison, 1.25 or better) - AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or better) + AC_CHECK_SEARCH_RESULT($BISON, bison, Please install Bison, 1.25 or newer) + AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or newer) if test $BISON != "error"; then - bison_version=`$BISON --version| sed 's/^.*version 1.//g' ` - if test $bison_version -lt 25; then + bison_version=`$BISON --version | sed 's/^.*version 1.//g'` + if test `echo $bison_version | sed 's/\..*$//g'` -lt 25; then AC_STEPMAKE_WARN(Your bison is a bit old (1.$bison_version). You might have to install 1.25) fi fi @@ -373,7 +460,9 @@ AC_DEFUN(AC_STEPMAKE_GETTEXT, [ ]) AC_DEFUN(AC_STEPMAKE_MAN, [ + AC_CHECK_PROGS(GROFF, groff ditroff, -echo no groff) AC_CHECK_PROGS(TROFF, troff, -echo no troff) + AC_CHECK_PROGS(TBL, tbl, cat) ]) AC_DEFUN(AC_STEPMAKE_MSGFMT, [ @@ -394,7 +483,8 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [ fi ]) -AC_DEFUN(AC_STEPMAKE_TEXMF, [ +#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)], [TEXPREFIX=$enableval], @@ -423,12 +513,80 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ if test "x$TEXDIR" = xauto ; then AC_TEX_SUBDIR(TEXDIR) fi - AC_SUBST(TEXPREFIX) AC_SUBST(TEXDIR) AC_SUBST(MFDIR) ]) +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_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 + fi + fi + AC_MSG_RESULT($TEX_TFMDIR) + AC_SUBST(TEX_TFMDIR) +]) + +AC_DEFUN(AC_STEPMAKE_TEXMF, [ + # urg, never know what names these teTeX guys will think up + + AC_CHECK_PROGS(METAFONT, mf, no) + if test "x$METAFONT" = "xno"; then + AC_CHECK_PROGS(MFONT, mfont, -echo no mf or mfont) + METAFONT=$MFONT + fi + + AC_CHECK_PROGS(METAPOST, mp, no) + if test "x$METAPOST" = "xno"; then + AC_CHECK_PROGS(MPOST, mpost, -echo no mp or mpost) + + METAPOST=$MPOST + fi + + AC_CHECK_PROGS(INIMETAFONT, inimf, no) + if test "x$INIMETAFONT" = "xno"; then + AC_CHECK_PROGS(INIMFONT, inimfont, -echo no inimf or inimfont) + INIMETAFONT=$INIMFONT + fi + + AC_CHECK_PROGS(INIMETAPOST, inimp, no) + if test "x$INIMETAPOST" = "xno"; then + AC_CHECK_PROGS(INIMPOST, inimpost, -echo no inimp or inimpost) + INIMETAPOST=$INIMPOST + fi + + AC_MSG_CHECKING(for working metafont mode) + modelist='ljfour lj4 lj3 lj2 ljet laserjet' + for MFMODE in $modelist; do + $METAFONT "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1 + if test -f mfput.tfm; then + break; + fi + done + rm -f mfput.* + AC_MSG_RESULT($MFMODE) + + AC_SUBST(METAFONT) + AC_SUBST(METAPOST) + AC_SUBST(MFMODE) + AC_SUBST(INIMETAFONT) + AC_SUBST(INIMETAPOST) +]) + AC_DEFUN(AC_STEPMAKE_WARN, [ AC_MSG_WARN($1) warn_b=yes @@ -444,11 +602,13 @@ AC_DEFUN(AC_STEPMAKE_YODL, [ AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl) AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl) AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl) + YODL2LESS_DIR='$(bindir)/' else AC_SUBST(STRIPROFF) AC_SUBST(YODL) AC_SUBST(YODL2HTML) AC_SUBST(YODL2LATEX) + AC_SUBST(YODL2LESS_DIR) AC_SUBST(YODL2MAN) AC_SUBST(YODL2MSLESS) AC_SUBST(YODL2TEXINFO) @@ -562,6 +722,39 @@ AC_DEFUN(AC_CHECK_SEARCH_RESULT, [ fi ]) +dnl GUILE_FLAGS --- set flags for compiling and linking with Guile +dnl +dnl This macro runs the `guile-config' script, installed with Guile, +dnl to find out where Guile's header files and libraries are +dnl installed. It sets two variables, marked for substitution, as +dnl by AC_SUBST. +dnl +dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build +dnl code that uses Guile header files. This is almost +dnl always just a -I flag. +dnl +dnl GUILE_LDFLAGS --- flags to pass to the linker to link a +dnl program against Guile. This includes `-lguile' for +dnl the Guile library itself, any libraries that Guile +dnl itself requires (like -lqthreads), and so on. It may +dnl also include a -L flag to tell the compiler where to +dnl find the libraries. + +AC_DEFUN([GUILE_FLAGS],[ +## The GUILE_FLAGS macro. + ## First, let's just see if we can find Guile at all. + AC_MSG_CHECKING(for Guile) + guile-config link > /dev/null || { + echo "configure: cannot find guile-config; is Guile installed?" 1>&2 + exit 1 + } + GUILE_CFLAGS="`guile-config compile`" + GUILE_LDFLAGS="`guile-config link`" + AC_SUBST(GUILE_CFLAGS) + AC_SUBST(GUILE_LDFLAGS) + AC_MSG_RESULT(yes) +]) + # Configure paths for GTK+ # Owen Taylor 97-11-3 @@ -588,7 +781,7 @@ dnl LIBS="$LIBS $GTK_LIBS" dnl dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent +dnl checks the results of gtk-config to some extent) dnl AC_TRY_RUN([ #include @@ -669,7 +862,7 @@ AC_DEFUN(AM_PATH_GTKMM, [dnl dnl -dnl Check check if the installed GTK-- is sufficiently new. +dnl Check if the installed GTK-- is sufficiently new. dnl AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) min_gtkmm_version=ifelse([$1], ,0.9.14,$1) @@ -792,7 +985,7 @@ main () echo "*** full path to gtk-config." echo "*** The gtkmm-config script was not available in GTK-- versions" echo "*** prior to 0.9.12. Perhaps you need to update your installed" - echo "*** version to 0.9.12 or later" + echo "*** version to 0.9.12 or newer" else if test -f conf.gtkmmtest ; then : @@ -858,7 +1051,7 @@ dnl LIBS="$LIBS $GTK___LIBS" dnl dnl Now check if the installed GTK__ is sufficiently new. (Also sanity -dnl checks the results of gtk__-config to some extent +dnl checks the results of gtk__-config to some extent) dnl AC_TRY_RUN([ #include @@ -892,3 +1085,36 @@ main () AC_SUBST(GTK___LIBS) ]) +dnl GUILE_FLAGS --- set flags for compiling and linking with Guile +dnl +dnl This macro runs the `guile-config' script, installed with Guile, +dnl to find out where Guile's header files and libraries are +dnl installed. It sets two variables, marked for substitution, as +dnl by AC_SUBST. +dnl +dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build +dnl code that uses Guile header files. This is almost +dnl always just a -I flag. +dnl +dnl GUILE_LDFLAGS --- flags to pass to the linker to link a +dnl program against Guile. This includes `-lguile' for +dnl the Guile library itself, any libraries that Guile +dnl itself requires (like -lqthreads), and so on. It may +dnl also include a -L flag to tell the compiler where to +dnl find the libraries. + +AC_DEFUN([GUILE_FLAGS],[ +## The GUILE_FLAGS macro. + ## First, let's just see if we can find Guile at all. + AC_MSG_CHECKING(for Guile) + guile-config link > /dev/null || { + echo "configure: cannot find guile-config; is Guile installed?" 1>&2 + exit 1 + } + GUILE_CFLAGS="`guile-config compile`" + GUILE_LDFLAGS="`guile-config link`" + AC_SUBST(GUILE_CFLAGS) + AC_SUBST(GUILE_LDFLAGS) + AC_MSG_RESULT(yes) +]) +