patch::: 1.3.11.hwn1

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index a7127718d839c23176ffaf4698e2c740f876c383..c3aad4ba2156cf7a7040ad330f7cefe9f567adfc 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -10,8 +10,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
@@ -44,12 +45,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)
@@ -103,7 +98,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)
@@ -345,7 +340,6 @@ dnl    fi
     AC_SUBST(PATHSEP)
     AC_SUBST(DIRSEP)
   
-   
     AC_STEPMAKE_DATADIR
 ])
 
@@ -567,6 +561,13 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
            break;
        fi
     done
+
+    #
+    # For now let people define these in their environments
+    #
+    : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`}
+    : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
+
     rm -f mfput.*
     AC_MSG_RESULT($MFMODE)
 
@@ -575,6 +576,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, [