X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=aclocal.m4;h=00a23fdb1948e6eda4edf0165dbc41aaa3425c29;hb=b8ef428503e626c3a5a7adc65282baf5e7dda205;hp=3bd68ad62f397a1d07402f5e7b2951f2b0280d24;hpb=43c708d5857fd1a15f0ebcf41d04f5a24441dc9a;p=lilypond.git diff --git a/aclocal.m4 b/aclocal.m4 index 3bd68ad62f..00a23fdb19 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,9 +1,5 @@ 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 @@ -138,9 +134,14 @@ 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, [ @@ -158,10 +159,32 @@ AC_DEFUN(AC_STEPMAKE_GXX, [ ]) AC_DEFUN(AC_STEPMAKE_GUILE, [ - GUILE_FLAGS - if guile-config --version 2>&1 | grep -q 'version 1\.[012]'; then - AC_STEPMAKE_WARN(Guile version 1.3 or better needed) + ## 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, [ @@ -187,22 +210,54 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ fi stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"` + # urg, how is this supposed to work? + if test "$program_prefix" = "NONE"; then + program_prefix= + fi + if test "$program_suffix" = "NONE"; then + program_suffix= + fi + AC_MSG_CHECKING(Package) if test "x$PACKAGE" = "xSTEPMAKE"; then AC_MSG_RESULT(Stepmake package!) - (cd stepmake; rm -f stepmake; ln -s ../stepmake .) - (cd stepmake; rm -f bin; ln -s ../bin .) + + #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 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 AC_MSG_RESULT($stepmake) else - stepmake='$(depth)'/stepmake - AC_MSG_RESULT(./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\ @@ -214,9 +269,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) @@ -234,8 +291,6 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ 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 @@ -246,13 +301,9 @@ 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 @@ -295,7 +346,7 @@ dnl fi LN=cp # hard link does not work under cygnus-nt LN_S='cp -r' # symbolic link does not work for native nt ZIP="zip -r -9" # - DOTEXE=.exe + program_suffix=.exe # urg # DIRSEP='\\' # PATHSEP=';' @@ -330,7 +381,8 @@ dnl fi ZIP="zip -r -9" INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" fi - AC_SUBST(DOTEXE) + AC_SUBST(program_prefix) + AC_SUBST(program_suffix) AC_SUBST(ZIP) AC_SUBST(LN) AC_SUBST(LN_S) @@ -565,8 +617,13 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ # # For now let people define these in their environments # - : ${MFPLAIN_MP=`kpsewhich mfplain.mp`} - : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'} + : ${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) @@ -735,14 +792,14 @@ 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`" + 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)