patch::: 1.3.37.jcn2

[lilypond.git] / stepmake / aclocal.m4

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 03d82fc7c73e9187be393b5152c90a77f3eade37..53d9704aedf2c95f716acd0bf651cba0e619f396 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -4,8 +4,9 @@ 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
@@ -38,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)
@@ -97,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)
@@ -137,9 +132,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, [
@@ -161,6 +161,8 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
     if guile-config --version 2>&1 | grep -q 'version 1\.[012]'; then
        AC_STEPMAKE_WARN(Guile version 1.3 or better needed)
     fi
+    AC_PATH_PROG(GUILE, guile, error)
+    AC_SUBST(GUILE)
 ])
 
 AC_DEFUN(AC_STEPMAKE_INIT, [
@@ -189,19 +191,43 @@ AC_DEFUN(AC_STEPMAKE_INIT, [
     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\
@@ -213,9 +239,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)
@@ -233,8 +261,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
@@ -245,13 +271,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
@@ -339,7 +361,6 @@ dnl    fi
     AC_SUBST(PATHSEP)
     AC_SUBST(DIRSEP)
   
-   
     AC_STEPMAKE_DATADIR
 ])
 
@@ -561,6 +582,18 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
            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)
 
@@ -569,6 +602,8 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
     AC_SUBST(MFMODE)
     AC_SUBST(INIMETAFONT)
     AC_SUBST(INIMETAPOST)
+    AC_SUBST(MFPLAIN_MP)
+    AC_SUBST(INIMETAPOST_FLAGS)
 ])
 
 AC_DEFUN(AC_STEPMAKE_WARN, [