X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=b69dc9c23b4c78dd1f77f8bbab56230ed66826f0;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=c5eea55ace0fb70cd2428003fa5b8be700f5e87e;hpb=6aeffdda6fca2cb56f901d65ea1d5dbeb398443e;p=lilypond.git

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index c5eea55ace..b69dc9c23b 100644
--- 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
@@ -728,7 +736,7 @@ AC_DEFUN(STEPMAKE_INIT, [
                             do `make conf=CONF' to get output in ./out-CONF],
     [CONFIGURATION=$enableval])
 
-    ##'
+    ##'`#
 
     test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION"
     CONFIGFILE=config$CONFIGSUFFIX
@@ -894,8 +902,7 @@ AC_DEFUN(STEPMAKE_LOCALE, [
 
     # with/enable ??
     AC_ARG_WITH(localedir,
-    [  --with-localedir=LOCALE use LOCALE as locale dir.  Default:
-                            PREFIX/share/locale ],
+    [  --with-localedir=DIR    location of locales.  Default: PREFIX/share/locale ],
     localedir=$with_localedir,
     localedir='${prefix}/share/locale')
 
@@ -995,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)
 ])
@@ -1011,7 +1021,7 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
 	    ])
     
     AC_ARG_WITH(python-lib,
-	[  --with-python-lib=NAME name of the python lib],[
+	[  --with-python-lib=NAME  name of the python lib],[
 	    if test "$withval" = "yes" -o "$withval" = "no"; then
 		AC_MSG_WARN(Usage: --with-python-lib=name)
 	    else
@@ -1028,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])
@@ -1039,6 +1054,27 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
     fi
 ])
 
+
+
+AC_DEFUN(STEPMAKE_STL_DATA_METHOD, [
+    AC_LANG_PUSH(C++)
+    AC_CACHE_CHECK([for stl.data () method],
+	[stepmake_stl_data_method],
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <vector>
+using namespace std;
+vector <int> v;
+void *p = v.data ();
+]])],
+	    [stepmake_stl_data_method=yes],
+	    [stepmake_stl_data_method=no]))
+    if test $stepmake_stl_data_method = yes; then
+	AC_DEFINE(HAVE_STL_DATA_METHOD, 1, [define if stl classes have data () method])
+    fi
+    AC_LANG_POP(C++)
+])
+
+
 AC_DEFUN(STEPMAKE_TEXMF_DIRS, [
     # ugh
     STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL)
@@ -1238,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
@@ -1259,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