X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=cdb6dc3cfb138758414390a38a94380337e7a99a;hb=3df8b5c18417ccd6bc98662c63f72061b931254e;hp=27dfb0b511786545fbac52cf8655f89f56b79b1b;hpb=3a14fdb8b6a16b5098f143eec3220c1a357d74d6;p=lilypond.git

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 27dfb0b511..cdb6dc3cfb 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -32,9 +32,13 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
     ## for compatibility reasons.
     
     ## grab the first version number in  --version output.
-    eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '\(^\| \)[0-9][0-9]*\.[0-9]' \
-        | head -n 1 \
-	| tr ' ' '\n' | sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | grep '\(^\| \)[0-9][0-9]*\.[0-9]' | head -n 1\`\"
+    eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 |
+		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
+		head -n 1 |
+		tr ' ' '\n' |
+		sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' |
+		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
+		head -n 1\`\"
 
     if test -z "$_ver"; then
         ## If empty, try date [fontforge]
@@ -163,8 +167,7 @@ AC_DEFUN(STEPMAKE_BISON, [
     fi
 ])
 
-
-AC_DEFUN(STEPMAKE_COMPILE, [
+AC_DEFUN(STEPMAKE_COMPILE_BEFORE, [
     # -O is necessary to get inlining
     CFLAGS=${CFLAGS-""}
     CXXFLAGS=${CXXFLAGS-$CFLAGS}
@@ -204,8 +207,13 @@ AC_DEFUN(STEPMAKE_COMPILE, [
     if test $debug_b = yes; then
 	OPTIMIZE="$OPTIMIZE -g"
     fi
- 
-    AC_PROG_CC
+])
+
+AC_DEFUN(STEPMAKE_COMPILE, [
+
+    AC_REQUIRE([STEPMAKE_COMPILE_BEFORE])
+    AC_REQUIRE([AC_PROG_CC])
+
     STEPMAKE_OPTIONAL_REQUIRED(CC, cc, $1)
     LD='$(CC)'
     AC_SUBST(LD)
@@ -401,6 +409,7 @@ EOF
 print 'depth=' + ('../' * ( $d-1 ) )
 print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make'
 print 'include \$(configure-srcdir)/$mf'
+print 'MODULE_INCLUDES += \$(src-dir)/\$(outbase)'
 EOF
 	    done
 	    for mf in `cd $srcdir ; find -maxdepth $d -mindepth $d -name '*.make' | grep -v config.make `; do