Merge branch 'master' into nested-bookparts

[lilypond.git] / stepmake / aclocal.m4

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index c3d41f612876775958d33ba4fd05e507d24eeaf0..b2e27613a4ed8bf796496ce5c05cea62ea5a8a6c 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -27,10 +27,14 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
 
     changequote(<<, >>)#dnl
 
+    ## Assume and hunt for dotted version multiplet.
+    ## use eval trickery, because we cannot use multi-level $() instead of ``
+    ## for compatibility reasons.
+    
     ## grab the first version number in  --version output.
-    eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' \
+    eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '\(^\| \)[0-9][0-9]*\.[0-9]' \
         | head -n 1 \
-       | tr ' ' '\n' | grep '[0-9]\.[0-9]' | head -n 1 | sed 's/\([0-9.]*\).*/\1/g'\`\"
+       | tr ' ' '\n' | sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | grep '\(^\| \)[0-9][0-9]*\.[0-9]' | head -n 1\`\"
 
     if test -z "$_ver"; then
         ## If empty, try date [fontforge]
@@ -284,7 +288,7 @@ AC_DEFUN(STEPMAKE_DATADIR, [
     build_package_datadir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/share/$package
     
     DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${prefix}/share!"`
-    DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
+    DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"`
     BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     
     AC_SUBST(datadir)
@@ -448,7 +452,7 @@ AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [
 using namespace std;
 #include <FlexLexer.h>
 EOF
-       FLEXLEXER_FILE=`$CXX -E conftest.cc | \
+       FLEXLEXER_FILE=`eval $ac_cpp conftest.cc | \
          sed 's!# 1 "\(.*FlexLexer.h\)"!@FLEXLEXER@\1@@!g' | grep '@@' | \
          sed 's!.*@FLEXLEXER@\(.*\)@@.*$!\1!g' ` 1> /dev/null 2> /dev/null
        rm conftest.cc
@@ -664,7 +668,11 @@ AC_DEFUN(STEPMAKE_INIT, [
 
        AC_MSG_CHECKING(builddir)
        ugh_ugh_autoconf250_builddir="`pwd`"
-       if test "$srcdir" = "."; then
+
+       here_dir=$(cd . && pwd)
+       full_src_dir=$(cd $srcdir && pwd)
+
+       if test "$full_src_dir" = "$here_dir"; then
            srcdir_build=yes
        else
            srcdir_build=no
@@ -1021,7 +1029,16 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
            fi
            ])
     
-    if test "$cross_compiling" = "no" -a -z "$PYTHON_CFLAGS"; then
+    AC_CHECK_PROGS(PYTHON_CONFIG, python-config, no)
+
+    if test -z "$PYTHON_CFLAGS" -a "$PYTHON_CONFIG" != "no"; then
+        # Clean out junk: http://bugs.python.org/issue3290
+       # Python headers may need some -f* flags, leave them in.
+       PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ -\(W\|D\|O\)\(\w\|-\)\+//g'`
+       PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+    fi
+    
+    if test -z "$PYTHON_CFLAGS" -a "$cross_compiling" = "no"; then
        changequote(<<, >>)#dnl
        # alternatively, for python >= 2.0
        # 'import sys, distutils.sysconfig; sys.stdout.write (distutils.sysconfig.get_python_inc ())'
@@ -1030,11 +1047,6 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
        changequote([, ])#dnl
     fi
     
-    if test "$cross_compiling" = "yes" -a -z "$PYTHON_CFLAGS"; then
-       PYTHON_CFLAGS=`python-config --cflags`
-       PYTHON_LDFLAGS=`python-config --ldflags`
-    fi
-    
     if test -z "$PYTHON_HEADER"; then
        CPPFLAGS="$PYTHON_CFLAGS $CPPFLAGS"
        AC_CHECK_HEADERS([Python.h],[PYTHON_HEADER=yes])
@@ -1074,6 +1086,7 @@ AC_DEFUN(STEPMAKE_TEXMF_DIRS, [
 
 AC_DEFUN(STEPMAKE_TEXMF, [
     STEPMAKE_PROGS(METAFONT, mf-nowin mf mfw mfont, $1)
+    STEPMAKE_PROGS(METAPOST, mpost, $1)
     # STEPMAKE_PROGS(INIMETAFONT, inimf inimfont "$METAFONT -ini", $1)
 
     AC_MSG_CHECKING(for working metafont mode)