X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=6b2886d4cb8daafed5fc25be9cbd2ad3e349fdf9;hb=ecdd29f28f2b05f970fa3a38b7622495730e645c;hp=3df8f7b6c84da5c1d67cc3897c57a8956635115c;hpb=9088acf723535f4bcf2041ea942c8e0fd9226004;p=lilypond.git diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 3df8f7b6c8..6b2886d4cb 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,13 +1,12 @@ -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 AC_DEFUN(AC_STEPMAKE_COMPILE, [ # -O is necessary to get inlining OPTIMIZE="" - CXXFLAGS=${CXXFLAGS:-""} CFLAGS=${CFLAGS:-""} + CXXFLAGS=${CXXFLAGS:-$CFLAGS} + LDFLAGS=${LDFLAGS:-""} checking_b=yes optimise_b=no profile_b=no @@ -40,12 +39,6 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ [MINGWPREFIX=$enableval], [MINGWPREFIX=no]) - if test "$printing_b" = no; then - # ugh - AC_DEFINE(NPRINT) - DEFINES="$DEFINES -DNPRINT" - fi - if test "$checking_b" = no; then # ugh AC_DEFINE(NDEBUG) @@ -99,7 +92,7 @@ AC_DEFUN(AC_STEPMAKE_CXX, [ CPPFLAGS="$CPPFLAGS $DEFINES" CXXFLAGS="$CXXFLAGS $OPTIMIZE" - LDFLAGS=$EXTRA_LIBES + LDFLAGS="$LDFLAGS $EXTRA_LIBES" AC_SUBST(CXXFLAGS) AC_SUBST(CXX) @@ -139,16 +132,21 @@ AC_DEFUN(AC_STEPMAKE_DATADIR, [ AC_DEFUN(AC_STEPMAKE_END, [ AC_OUTPUT($CONFIGFILE.make:config.make.in) - rm -f GNUmakefile - cp make/toplevel.make.in ./GNUmakefile - chmod 444 GNUmakefile + rm -f $srcdir/GNUmakefile + cp $srcdir/make/toplevel.make.in $srcdir/GNUmakefile + chmod 444 $srcdir/GNUmakefile + if test "$builddir" != "."; then + rm -f GNUmakefile + cp $srcdir/make/srcdir.make.in GNUmakefile + chmod 444 GNUmakefile + fi ]) AC_DEFUN(AC_STEPMAKE_GXX, [ # ugh autoconf # urg, egcs: how to check for egcs >= 1.1? changequote(<<, >>)dnl - if $CXX --version | grep '2\.8' > /dev/null || + if $CXX --version | egrep '2\.[89]' > /dev/null || $CXX --version | grep 'egcs' > /dev/null changequote([, ])dnl then @@ -159,25 +157,32 @@ AC_DEFUN(AC_STEPMAKE_GXX, [ ]) 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 - AC_CHECK_LIB(guile, gh_scm2doubles, \ - LIBS="-lguile $LIBS"; AC_DEFINE(HAVE_LIBGUILE), \ - AC_CHECK_LIB(readline, readline) \ - AC_CHECK_LIB(dl, dlopen) \ - AC_CHECK_LIB(socket, socket)\ - AC_CHECK_LIB(termcap,tgetent)\ - AC_CHECK_LIB(m, fabs)\ - AC_CHECK_LIB(guile, gh_doubles2scm)\ - ) - if test "$ac_cv_lib_guile_gh_scm2doubles" != yes -a \ - "$ac_cv_lib_guile_gh_doubles2scm" != yes ; then - AC_STEPMAKE_WARN(You should install guile 1.3 or newer) + ## First, let's just see if we can find Guile at all. + AC_MSG_CHECKING("for guile-config") + for guile_config in guile-config $target-guile-config $build-guile-config; do + AC_MSG_RESULT("$guile_config") + if ! $guile_config --version > /dev/null 2>&1 ; then + AC_MSG_WARN("cannot execute $guile_config") + AC_MSG_CHECKING("if we are cross compiling") + guile_config=error + else + break + fi + done + if test "$guile_config" = "error"; then + AC_MSG_ERROR("cannot find guile-config; is Guile installed?") + exit 1 fi + AC_MSG_CHECKING("Guile version") + need_guile_version="1.3.4" + guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"` + AC_MSG_RESULT("$guile_version") + if test "$guile_version" != "$need_guile_version"; then + AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed") + fi + GUILE_FLAGS + AC_PATH_PROG(GUILE, guile, error) + AC_SUBST(GUILE) ]) AC_DEFUN(AC_STEPMAKE_INIT, [ @@ -203,20 +208,46 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ fi stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"` + AC_MSG_CHECKING(Package) if test "x$PACKAGE" = "xSTEPMAKE"; then - echo Stepmake package! - (cd stepmake; rm -f stepmake; ln -s ../stepmake .) - (cd stepmake; rm -f bin; ln -s ../bin .) + AC_MSG_RESULT(Stepmake package!) + + #if test "x$builddir" != "x"; then + # builddir="../$builddir" + #else + # builddir=.. + #fi + if test "$srcdir" != "."; then + absolute_builddir="`pwd`" + package_absolute_builddir="`dirname $absolute_builddir`" + package_srcdir="`dirname $srcdir`" + builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`" + else + builddir=. + fi + + (cd stepmake 2>/dev/null || mkdir stepmake) + (cd stepmake; rm -f stepmake; ln -s ../$srcdir/stepmake .) + (cd stepmake; rm -f bin; ln -s ../$srcdir/bin .) AC_CONFIG_AUX_DIR(bin) stepmake=stepmake else - echo Package: $PACKAGE + AC_MSG_RESULT($PACKAGE) + + if test "$srcdir" != "."; then + absolute_builddir="`pwd`" + builddir="`dirname $srcdir`/`basename $absolute_builddir`" + else + builddir=. + fi + + AC_MSG_CHECKING(for stepmake) # Check for installed stepmake if test -d $stepmake; then - echo Using installed stepmake: $stepmake + AC_MSG_RESULT($stepmake) else - stepmake='$(depth)'/stepmake - echo Using local stepmake: $datadir/stepmake not found + stepmake='$(depth)'/$srcdir/stepmake + AC_MSG_RESULT($srcdir/stepmake ($datadir/stepmake not found)) fi AC_CONFIG_AUX_DIR(\ $HOME/usr/local/share/stepmake/bin\ @@ -228,9 +259,11 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ /usr/share/stepmake/bin\ /usr/lib/stepmake/bin\ stepmake/bin\ + $srcdir/stepmake/bin\ ) fi + AC_SUBST(builddir) AC_SUBST(stepmake) AC_SUBST(package) AC_SUBST(PACKAGE) @@ -238,13 +271,16 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ 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" AC_SUBST(AUTOGENERATE) - absolute_builddir="`pwd`" - AC_SUBST(absolute_builddir) STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null` if test "x$STATE_VECTOR" != "x"; then @@ -255,20 +291,15 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ CONFIGSUFFIX= AC_ARG_ENABLE(config, [ enable-config=FILE put configure settings in config-FILE.make], - [CONFIGSUFFIX=$enableval]) + [CONFIGSUFFIX=-$enableval]) - if test "$CONFIGSUFFIX" != "" ; then - CONFIGFILE=config-$CONFIGSUFFIX - else - CONFIGFILE=config - fi + CONFIGFILE=config$CONFIGSUFFIX 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 @@ -276,26 +307,34 @@ 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 # urg @@ -342,7 +381,6 @@ dnl fi AC_SUBST(PATHSEP) AC_SUBST(DIRSEP) - AC_STEPMAKE_DATADIR ]) @@ -363,8 +401,8 @@ AC_DEFUN(AC_STEPMAKE_LEXYACC, [ 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 @@ -447,7 +485,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, [ @@ -468,7 +508,8 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [ fi ]) -AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ +#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], @@ -502,8 +543,32 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ 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) @@ -513,11 +578,52 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ 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 + + # + # For now let people define these in their environments + # + : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`} + + if test ${INIMETAPOST} = "inimp" ; then + : ${INIMETAPOST_FLAGS=''} + else + : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'} + fi + + rm -f mfput.* + AC_MSG_RESULT($MFMODE) + AC_SUBST(METAFONT) AC_SUBST(METAPOST) + AC_SUBST(MFMODE) + AC_SUBST(INIMETAFONT) + AC_SUBST(INIMETAPOST) + AC_SUBST(MFPLAIN_MP) + AC_SUBST(INIMETAPOST_FLAGS) ]) AC_DEFUN(AC_STEPMAKE_WARN, [ @@ -655,6 +761,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. + AC_MSG_CHECKING(for Guile) + if ! $guile_config link > /dev/null ; then + AC_MSG_RESULT("cannot execute $guile_config") + AC_MSG_ERROR("cannot find guile-config; is Guile installed?") + exit 1 + fi + 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 @@ -681,7 +820,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 @@ -762,7 +901,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) @@ -951,7 +1090,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 @@ -984,4 +1123,3 @@ main () AC_SUBST(GTK___CFLAGS) AC_SUBST(GTK___LIBS) ]) -