Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / stepmake / aclocal.m4

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index b51d087712eb3eb0b43e483094293863c495c0fd..25a0f5426b65915f87b8c4e0831102b947db6a1f 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -26,14 +26,16 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
     ## -V: Workaround for python
 
     changequote(<<, >>)#dnl
+
     ## Assume and hunt for dotted version multiplet.
     ## use eval trickery, because we cannot use multi-level $() instead of ``
     ## for compatibility reasons.
-    ## FIXME: what systems still do not have $() in /bin/sh?
-    eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' \
+    
+    ## 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 \
-       | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
-           -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
+       | 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]
         eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
@@ -285,10 +287,12 @@ AC_DEFUN(STEPMAKE_DATADIR, [
     
     build_package_datadir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/share/$package
     
-    DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
+    DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${prefix}/share!"`
+    DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"`
     BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     
     AC_SUBST(datadir)
+    AC_SUBST(datarootdir)
     AC_SUBST(build_package_datadir)
     AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"])
     AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])
@@ -450,7 +454,7 @@ using namespace std;
 EOF
        FLEXLEXER_FILE=`$CXX -E conftest.cc | \
          sed 's!# 1 "\(.*FlexLexer.h\)"!@FLEXLEXER@\1@@!g' | grep '@@' | \
-         sed 's!.*@FLEXLEXER@\(.*\)@@.*$!\1!g' ` >& /dev/null
+         sed 's!.*@FLEXLEXER@\(.*\)@@.*$!\1!g' ` 1> /dev/null 2> /dev/null
        rm conftest.cc
        AC_SUBST(FLEXLEXER_FILE)
         AC_MSG_RESULT($FLEXLEXER_FILE)
@@ -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
@@ -994,6 +1002,9 @@ AC_DEFUN(STEPMAKE_PYTHON, [
     if test -n "$pv"; then
        STEPMAKE_ADD_ENTRY($1, $pv)
     fi
+    # clear cached value since arg 2 might point us to a new binary
+    unset ac_cv_path_PYTHON
+
     AC_PATH_PROG(PYTHON, $PYTHON)
     AC_SUBST(PYTHON)
 ])
@@ -1027,6 +1038,11 @@ 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])
@@ -1038,6 +1054,8 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
     fi
 ])
 
+
+
 AC_DEFUN(STEPMAKE_STL_DATA_METHOD, [
     AC_LANG_PUSH(C++)
     AC_CACHE_CHECK([for stl.data () method],
@@ -1256,11 +1274,11 @@ AC_DEFUN(STEPMAKE_WINDOWS, [
     AC_CYGWIN
     AC_MINGW32
 
-    if test "$CYGWIN" == "yes"; then
+    if test "$CYGWIN" = "yes"; then
        LN_S='cp -r' # Cygwin symbolic links do not work for native apps.
        program_suffix=.exe
        INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c"
-    elif test "$MINGW32" == "yes"; then
+    elif test "$MINGW32" = "yes"; then
        LN='cp -r'
        LN_S='cp -r'
        program_suffix=.exe
@@ -1277,7 +1295,7 @@ AC_DEFUN(STEPMAKE_WINDOWS, [
     AC_SUBST(program_suffix)
 
     AC_MSG_CHECKING([for some flavor of Windows])
-    if test "$CYGWIN$MINGW32" == "nono"; then
+    if test "$CYGWIN$MINGW32" = "nono"; then
         PLATFORM_WINDOWS=no
     else
         PLATFORM_WINDOWS=yes