X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=aclocal.m4;h=ed47b8350efe006c1bf6443d775b79bd282ebece;hb=3025442087de8dd3f88736290887ced86e360c25;hp=c9f0093381604ad131867608ef50e772de949f45;hpb=29b05c33ce2a1b0ee671afb52d23a40e5fb26a39;p=lilypond.git

diff --git a/aclocal.m4 b/aclocal.m4
index c9f0093381..ed47b8350e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -42,7 +42,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
 
     if test -z "$_ver"; then
         ## If empty, try date [fontforge]
-        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
+        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \
+	    | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
 	    | head -n 1 \
 	    | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
     fi
@@ -173,6 +174,7 @@ AC_DEFUN(STEPMAKE_COMPILE_BEFORE, [
     CXXFLAGS=${CXXFLAGS-$CFLAGS}
     LDFLAGS=${LDFLAGS-""}
     optimise_b=yes
+    checks_b=no
     profile_b=no
     debug_b=yes
     pipe_b=yes
@@ -182,6 +184,11 @@ AC_DEFUN(STEPMAKE_COMPILE_BEFORE, [
                     [compile with debugging info.  Default: on])],
     [debug_b=$enableval])
 
+    AC_ARG_ENABLE(checking,
+    [AS_HELP_STRING([--enable-checking],
+                    [compile with expensive run-time checks.  Default: off])],
+    [checks_b=$enableval])
+
     AC_ARG_ENABLE(optimising,
     [AS_HELP_STRING([--enable-optimising],
                     [compile with optimising.  Default: on])],
@@ -198,9 +205,17 @@ AC_DEFUN(STEPMAKE_COMPILE_BEFORE, [
     [pipe_b=$enableval])
 
     if test "$optimise_b" = yes; then
-	AC_DEFINE(NDEBUG)
-	DEFINES="$DEFINES -DNDEBUG"
 	OPTIMIZE=" -O2 -finline-functions"
+	# following two lines are compatibility while Patchy has not
+	# yet learnt about --enable-checking.  But once it has, we
+	# don't want -DDEBUG twice, so we omit it here if it is going
+	# to get added anyway later.
+    elif test "$checks_b" != yes; then
+	DEFINES="$DEFINES -DDEBUG"
+    fi
+
+    if test "$checks_b" = yes; then
+	DEFINES="$DEFINES -DDEBUG"
     fi
 
     if test $profile_b = yes; then
@@ -266,11 +281,9 @@ AC_DEFUN(STEPMAKE_CXX, [
     STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1)
 
     CXXFLAGS="$CXXFLAGS $OPTIMIZE"
-    LD='$(CXX)'
 
     AC_SUBST(CXX)
     AC_SUBST(CXXFLAGS)
-    AC_SUBST(LD)
 ])
 
 
@@ -674,7 +687,7 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
 	AC_MSG_RESULT([$ver])
 	GUILE_CONFIG=$found
     else
-	STEPMAKE_ADD_ENTRY($1, "$guile_config (guile-devel, guile-dev or libguile-dev package) or guile1-config (guile1-devel package)")
+	STEPMAKE_ADD_ENTRY($1, "$guile_config (guile-devel, guile-dev or libguile-dev package)")
     fi
 
     AC_SUBST(GUILE_CONFIG)
@@ -1128,6 +1141,8 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
 	warn="Python.h (python-devel, python-dev or libpython-dev package)"
 	STEPMAKE_ADD_ENTRY($1, $warn)
     fi
+    AC_SUBST(PYTHON_CFLAGS)
+    AC_SUBST(PYTHON_LDFLAGS)
 ])