release: 1.0.9

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 9947522568236a9184ca9543fbceb68d3b7c6575..e1592d654a819c3c798141bcb7013bd152982d6e 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -7,6 +7,7 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
     # -O is necessary to get inlining
     OPTIMIZE=""
     CXXFLAGS=${CXXFLAGS:-""}
+    CFLAGS=${CFLAGS:-""}
     checking_b=yes
     optimise_b=no
     profile_b=no
@@ -264,8 +265,10 @@ dnl    fi
     AC_SUBST(LN)
     AC_SUBST(LN_S)
     AC_SUBST(INSTALL)
-   AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
-     AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
+    AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
+    AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
+    AC_SUBST(PATHSEP)
+    AC_SUBST(DIRSEP)
   
    
     AC_STEPMAKE_DATADIR
@@ -439,6 +442,7 @@ AC_DEFUN(AC_STEPMAKE_YODL, [
        AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl)
        AC_CHECK_PROGS(YODL2LATEX, yodl2latex, )
        AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no 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)
     else
@@ -446,9 +450,10 @@ AC_DEFUN(AC_STEPMAKE_YODL, [
        AC_SUBST(YODL2HTML)
        AC_SUBST(YODL2LATEX)
        AC_SUBST(YODL2MAN)
+       AC_SUBST(YODL2MSLESS)
        AC_SUBST(YODL2TEXINFO)
        AC_SUBST(YODL2TXT)
-       export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT
+       export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT
     fi
     if test "x$YODL" = "-echo no yodl"; then
        AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl))