X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=be97fa96de6dc2b1ff96b03d69f21050b5efa6e9;hb=bd2db986b410591905f89552af5df579dfc1b9fc;hp=18ea29d3ca705489db3ec71f85da88b2b979270c;hpb=ba5e7d47d73c9aa789d93649979552afc860bb9a;p=lilypond.git diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 18ea29d3ca..be97fa96de 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' | grep '[0-9]\.[0-9]' | head -n 1 | sed 's/\([0-9.]*\).*/\1/g'\`\" + if test -z "$_ver"; then ## If empty, try date [fontforge] eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \ @@ -191,7 +193,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [ if test "$optimise_b" = yes; then AC_DEFINE(NDEBUG) DEFINES="$DEFINES -DNDEBUG" - OPTIMIZE="-O2 -finline-functions" + OPTIMIZE=" -O2 -finline-functions" fi if test $profile_b = yes; then @@ -211,7 +213,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [ # If -pipe requested, test if it works and add to CFLAGS. if test "$pipe_b" = yes; then save_cflags="$CFLAGS" - CFLAGS="-pipe $CFLAGS"; + CFLAGS=" -pipe $CFLAGS"; AC_CACHE_CHECK([whether compiler understands -pipe], [stepmake_cflags_pipe], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[/* -pipe test */]])], @@ -232,7 +234,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [ alpha*-*-*) dnl should do compile test? AC_MSG_RESULT(-mieee) - CFLAGS="-mieee $CFLAGS" + CFLAGS=" -mieee $CFLAGS" ;; *) AC_MSG_RESULT([none]) @@ -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}"]) @@ -371,14 +375,14 @@ EOF mkdir -p $(dirname $mf) cat < $mf print 'depth=' + ('../' * ( $d-1 ) ) -print 'include \$(depth)/config.make' +print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make' print 'include \$(configure-srcdir)/$mf' EOF done for mf in `cd $srcdir ; find -maxdepth $d -mindepth $d -name '*.make' | grep -v config.make `; do mkdir -p $(dirname $mf) cat < $mf -print 'include \$(depth)/config.make' +print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make' print 'include \$(configure-srcdir)/$mf' EOF done @@ -387,7 +391,7 @@ EOF cat < GNUmakefile depth = ./ -include config.make +include config\$(if \$(conf),-\$(conf),).make include \$(configure-srcdir)/GNUmakefile.in EOF AC_SUBST(VPATH) @@ -441,19 +445,19 @@ class yy_flex_lexer: public yyFlexLexer AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [ - AC_MSG_CHECKING([FlexLexer.h path]) + AC_MSG_CHECKING([FlexLexer.h location]) # ugh. cat < conftest.cc using namespace std; #include EOF - FLEXLEXER_PATH=`$CXX -E conftest.cc | \ - sed 's!# 1 "\(.*\)FlexLexer.h"!@FLEXLEXER@\1@@!g' | grep '@@' | \ - sed 's!.*@FLEXLEXER@\(.*\)@@.*$!\1!g' ` >& /dev/null + FLEXLEXER_FILE=`$CXX -E 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 - AC_SUBST(FLEXLEXER_PATH) - AC_MSG_RESULT($FLEXLEXER_PATH) + AC_SUBST(FLEXLEXER_FILE) + AC_MSG_RESULT($FLEXLEXER_FILE) ]) AC_DEFUN(STEPMAKE_GCC, [ @@ -658,15 +662,17 @@ AC_DEFUN(STEPMAKE_INIT, [ (cd stepmake 2>/dev/null || mkdir stepmake) (cd stepmake; rm -f bin; ln -s ../$srcdir/bin .) -# only possible with autoconf < 2.50 -- hardcoded in configure.in -# AC_CONFIG_AUX_DIR(bin) stepmake=stepmake else AC_MSG_RESULT($PACKAGE) 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 @@ -681,19 +687,14 @@ AC_DEFUN(STEPMAKE_INIT, [ stepmake="`cd $srcdir/stepmake; pwd`" AC_MSG_RESULT([$srcdir/stepmake ($datadir/stepmake not found)]) fi - -# only possible with autoconf < 2.50 -- hardcoded in configure.in -# AC_CONFIG_AUX_DIR(\ -# stepmake/bin\ -# $srcdir/stepmake/bin\ -# ) fi AC_SUBST(ugh_ugh_autoconf250_builddir) - # use absolute path. - if test "$srcdir" != "." ; then - srcdir=$(cd $srcdir; pwd) + # Use absolute directory for non-srcdir builds, so that build + # dir can be moved. + if test "$srcdir_build" = "no" ; then + srcdir="`cd $srcdir; pwd`" fi AC_SUBST(srcdir) @@ -732,10 +733,10 @@ AC_DEFUN(STEPMAKE_INIT, [ CONFIGSUFFIX= AC_ARG_ENABLE(config, [ --enable-config=CONF put settings in config-CONF.make and config-CONF.h; - do \`make conf=CONF' to get output in ./out-CONF], + do `make conf=CONF' to get output in ./out-CONF], [CONFIGURATION=$enableval]) - ##' + ##'`# test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION" CONFIGFILE=config$CONFIGSUFFIX @@ -776,14 +777,12 @@ AC_DEFUN(STEPMAKE_INIT, [ LN=ln LN_S='ln -s' ZIP="zip -r -9" - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" AC_SUBST(program_prefix) AC_SUBST(program_suffix) AC_SUBST(ZIP) AC_SUBST(LN) AC_SUBST(LN_S) - AC_SUBST(INSTALL) AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}']) AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}']) AC_SUBST(DIRSEP) @@ -817,12 +816,9 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [ ]) kpathsea_b=yes - #FIXME --with-xxx is meant for specifying a PATH too, - # so this should read: --enable-kpathsea, - # or --with-kpathsea-include=PATH --with-kpathsea-lib=PATH - AC_ARG_WITH(kpathsea, - [ --with-kpathsea use kpathsea lib. Default: on], - [kpathsea_b=$with_kpathsea]) + AC_ARG_ENABLE(kpathsea, + [ --enable-kpathsea use kpathsea lib. Default: on], + [kpathsea_b=$enableval]) save_LIBS="$LIBS" if test "$kpathsea_b" != "no"; then @@ -835,7 +831,7 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [ fi save_CFLAGS="$CFLAGS" - CFLAGS=$(echo "-shared $CFLAGS" | sed -e 's/ -g//') + CFLAGS=`echo "-shared $CFLAGS" | sed -e 's/ -g//'` AC_MSG_CHECKING([for shared libkpathsea]) AC_TRY_LINK([#include ], [kpse_var_expand ("\$TEXMF");], @@ -906,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') @@ -1007,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) ]) @@ -1023,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 @@ -1040,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]) @@ -1051,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 +using namespace std; +vector 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) @@ -1150,7 +1174,7 @@ AC_DEFUN(STEPMAKE_FREETYPE2, [ # UGR #r="lib$1-dev or $1-devel" r="libfreetype6-dev or freetype?-devel" - ver="$(pkg-config --modversion $1)" + ver="`pkg-config --modversion $1`" STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi ]) @@ -1172,7 +1196,7 @@ AC_DEFUN(STEPMAKE_GTK2, [ # UGR # r="lib$1-dev or $1-devel" r="libgtk2.0-dev or gtk2-devel" - ver="$(pkg-config --modversion $1)" + ver="`pkg-config --modversion $1`" STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi ]) @@ -1196,7 +1220,7 @@ AC_DEFUN(STEPMAKE_PANGO, [ # UGR #r="lib$1-dev or $1-devel" r="libpango1.0-dev or pango1.0-devel" - ver="$(pkg-config --modversion $1)" + ver="`pkg-config --modversion $1`" STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi ]) @@ -1221,7 +1245,7 @@ AC_DEFUN(STEPMAKE_PANGO_FT2, [ # UGR #r="lib$1-dev or $1-devel"e r="libpango1.0-dev or pango?-devel" - ver="$(pkg-config --modversion $1)" + ver="`pkg-config --modversion $1`" STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi ]) @@ -1241,7 +1265,7 @@ AC_DEFUN(STEPMAKE_FONTCONFIG, [ LIBS="$save_LIBS" else r="lib$1-dev or $1-devel" - ver="$(pkg-config --modversion $1)" + ver="`pkg-config --modversion $1`" STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi ]) @@ -1250,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 @@ -1264,7 +1288,6 @@ AC_DEFUN(STEPMAKE_WINDOWS, [ AC_SUBST(LN) AC_SUBST(LN_S) - AC_SUBST(INSTALL) AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}']) AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}']) AC_SUBST(DIRSEP) @@ -1272,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