X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=83c07c3a2ddc549c012917841ce641fc9a0122fe;hb=0c77902e90b113823f3ea0004d7dfaf8aed218a8;hp=e35b8625a1109df9035b63d2d18d7849e71e18b3;hpb=d4dfa0ea52d0107c6a810b28e67a742f6f331949;p=lilypond.git diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index e35b8625a1..83c07c3a2d 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\}' \ @@ -161,8 +163,7 @@ AC_DEFUN(STEPMAKE_BISON, [ fi ]) - -AC_DEFUN(STEPMAKE_COMPILE, [ +AC_DEFUN(STEPMAKE_COMPILE_BEFORE, [ # -O is necessary to get inlining CFLAGS=${CFLAGS-""} CXXFLAGS=${CXXFLAGS-$CFLAGS} @@ -191,19 +192,24 @@ 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 - EXTRA_LIBES="-pg" + EXTRA_LIBS="-pg" OPTIMIZE="$OPTIMIZE -pg" fi if test $debug_b = yes; then OPTIMIZE="$OPTIMIZE -g" fi - - AC_PROG_CC +]) + +AC_DEFUN(STEPMAKE_COMPILE, [ + + AC_REQUIRE([STEPMAKE_COMPILE_BEFORE]) + AC_REQUIRE([AC_PROG_CC]) + STEPMAKE_OPTIONAL_REQUIRED(CC, cc, $1) LD='$(CC)' AC_SUBST(LD) @@ -211,14 +217,14 @@ 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], + [stepmake_cv_cflags_pipe], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[/* -pipe test */]])], - [stepmake_cflags_pipe=yes], - [stepmake_cflags_pipe=no])) + [stepmake_cv_cflags_pipe=yes], + [stepmake_cv_cflags_pipe=no])) CFLAGS=$save_cflags - if test $stepmake_cflags_pipe = yes; then + if test $stepmake_cv_cflags_pipe = yes; then OPTIMIZE="$OPTIMIZE -pipe" fi fi @@ -232,7 +238,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]) @@ -243,10 +249,8 @@ AC_DEFUN(STEPMAKE_COMPILE, [ AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) - AC_SUBST(ICFLAGS) - AC_SUBST(ILDFLAGS) AC_SUBST(DEFINES) - AC_SUBST(EXTRA_LIBES) + AC_SUBST(EXTRA_LIBS) ]) AC_DEFUN(STEPMAKE_CXX, [ @@ -254,25 +258,23 @@ AC_DEFUN(STEPMAKE_CXX, [ AC_PROG_CXX STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1) - CPPFLAGS="$CPPFLAGS $DEFINES" CXXFLAGS="$CXXFLAGS $OPTIMIZE" - LDFLAGS="$LDFLAGS $EXTRA_LIBES" + LD='$(CXX)' - AC_SUBST(CXXFLAGS) AC_SUBST(CXX) - LD='$(CXX)' + AC_SUBST(CXXFLAGS) AC_SUBST(LD) ]) AC_DEFUN(STEPMAKE_CXXTEMPLATE, [ AC_CACHE_CHECK([whether explicit instantiation is needed], - lily_cv_need_explicit_instantiation, + stepmake_cv_need_explicit_instantiation, AC_LINK_IFELSE([AC_LANG_PROGRAM([[ template struct foo { static int baz; }; template int foo::baz = 1; - ]], [[ return foo::baz; ]])],[lily_cv_need_explicit_instantiation=no],[lily_cv_need_explicit_instantiation=yes])) - if test x"$lily_cv_need_explicit_instantiation"x = x"yes"x; then + ]], [[ return foo::baz; ]])],[stepmake_cv_need_explicit_instantiation=no],[stepmake_cv_need_explicit_instantiation=yes])) + if test x"$stepmake_cv_need_explicit_instantiation"x = x"yes"x; then AC_DEFINE(NEED_EXPLICIT_INSTANTIATION) fi ]) @@ -287,12 +289,14 @@ AC_DEFUN(STEPMAKE_DATADIR, [ presome=${ac_default_prefix} fi - build_package_datadir=$ugh_ugh_autoconf250_builddir/share/$package + 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}"]) @@ -305,7 +309,7 @@ AC_DEFUN(STEPMAKE_LIBDIR, [ libdir='${exec_prefix}/lib' fi presome=$exec_prefix - build_package_libdir=$ugh_ugh_autoconf250_builddir/lib/$package + build_package_libdir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/lib/$package LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"` BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_prefix}!$presome!"` @@ -317,7 +321,31 @@ AC_DEFUN(STEPMAKE_LIBDIR, [ ]) +AC_DEFUN(STEPMAKE_PREFIX_EXPAND_FIXUP, [ + # undo expanding of explicit --infodir=/usr/share + # to ease install-time override with prefix=... + strip=`echo $includedir | eval sed s@^$prefix@@` + if test "$includedir" = "`eval echo $prefix$strip`"; then + includedir='${prefix}'$strip'' + fi + strip=`echo $libdir | eval sed s@^$exec_prefix@@` + if test "$libdir" = "`eval echo $exec_prefix$strip`"; then + libdir='${exec_prefix}'$strip'' + fi + strip=`echo $infodir | eval sed s@^$datarootdir@@` + if test "$infodir" = "`eval echo $datarootdir$strip`"; then + infodir='${datarootdir}'$strip'' + fi + strip=`echo $mandir | eval sed s@^$datarootdir@@` + if test "$mandir" = "`eval echo $datarootdir$strip`"; then + mandir='${datarootdir}'$strip'' + fi +]) + + AC_DEFUN(STEPMAKE_END, [ + STEPMAKE_PREFIX_EXPAND_FIXUP + AC_SUBST(OPTIONAL) AC_SUBST(REQUIRED) @@ -358,10 +386,44 @@ AC_DEFUN(STEPMAKE_END, [ rm -f $srcdir/GNUmakefile cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile chmod 444 $srcdir/GNUmakefile - else # --srcdir build - rm -f GNUmakefile - cp $srcdir/make/srcdir.make.in GNUmakefile - chmod 444 GNUmakefile + else + if test -f $srcdir/GNUmakefile; then + cat < $mf +print 'depth=' + ('../' * ( $d-1 ) ) +print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make' +print 'include \$(configure-srcdir)/$mf' +print 'MODULE_INCLUDES += \$(src-dir)/\$(outbase)' +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\$(if \$(conf),-\$(conf),).make' +print 'include \$(configure-srcdir)/$mf' +EOF + done + done + + + cat < GNUmakefile +depth = ./ +include config\$(if \$(conf),-\$(conf),).make +include \$(configure-srcdir)/GNUmakefile.in +EOF + AC_SUBST(VPATH) fi ]) @@ -388,7 +450,7 @@ AC_DEFUN(STEPMAKE_FLEXLEXER, [ # in 2.5.4 <= flex < 2.5.29 AC_LANG_PUSH(C++) AC_CACHE_CHECK([for yyFlexLexer.yy_current_buffer], - [stepmake_flexlexer_yy_current_buffer], + [stepmake_cv_flexlexer_yy_current_buffer], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ using namespace std; #include @@ -401,9 +463,9 @@ class yy_flex_lexer: public yyFlexLexer } }; ]])], - [stepmake_flexlexer_yy_current_buffer=yes], - [stepmake_flexlexer_yy_current_buffer=no])) - if test $stepmake_flexlexer_yy_current_buffer = yes; then + [stepmake_cv_flexlexer_yy_current_buffer=yes], + [stepmake_cv_flexlexer_yy_current_buffer=no])) + if test $stepmake_cv_flexlexer_yy_current_buffer = yes; then AC_DEFINE(HAVE_FLEXLEXER_YY_CURRENT_BUFFER, 1, [Define to 1 if yyFlexLexer has yy_current_buffer.]) fi AC_LANG_POP(C++) @@ -412,14 +474,19 @@ class yy_flex_lexer: public yyFlexLexer AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [ - AC_MSG_CHECKING([FlexLexer.h path]) - - # ugh. - FLEXLEXER_PATH=`echo '#include ' | $CXX -E - | \ - sed 's!# 1 "\(.*\)FlexLexer.h"!@FLEXLEXER@\1@@!g' | grep '@@' | \ - sed 's!.*@FLEXLEXER@\(.*\)@@.*$!\1!g' ` >& /dev/null - AC_SUBST(FLEXLEXER_PATH) - AC_MSG_RESULT($FLEXLEXER_PATH) + AC_MSG_CHECKING([FlexLexer.h location]) + + # ugh. + cat < conftest.cc +using namespace std; +#include +EOF + 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 + AC_SUBST(FLEXLEXER_FILE) + AC_MSG_RESULT($FLEXLEXER_FILE) ]) AC_DEFUN(STEPMAKE_GCC, [ @@ -575,9 +642,12 @@ AC_DEFUN(STEPMAKE_INIT, [ AC_PREREQ(2.50) . $srcdir/VERSION FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL + MICRO_VERSION=$PATCH_LEVEL + TOPLEVEL_VERSION=$FULL_VERSION if test x$MY_PATCH_LEVEL != x; then FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL fi + VERSION=$FULL_VERSION export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:] changequote(<<, >>)#dnl @@ -621,15 +691,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 @@ -644,21 +716,29 @@ 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 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) AC_SUBST(stepmake) AC_SUBST(package) AC_SUBST(PACKAGE) AC_SUBST(PACKAGE_NAME) + AC_SUBST(VERSION) AC_SUBST(MAJOR_VERSION) AC_SUBST(MINOR_VERSION) + AC_SUBST(MICRO_VERSION) + + # stepmake nonstandard names + AC_SUBST(PATCH_LEVEL) + AC_SUBST(TOPLEVEL_VERSION) # We don't need the upper case variant, # so stick to macros are uppercase convention. @@ -682,10 +762,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 @@ -726,14 +806,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) @@ -745,94 +823,6 @@ AC_DEFUN(STEPMAKE_INIT, [ ]) -AC_DEFUN(STEPMAKE_KPATHSEA, [ - - AC_ARG_WITH(kpathsea-include, - [ --with-kpathsea-include=DIR - location of the kpathsea include dir],[ - if test "$withval" = "yes" -o "$withval" = "no"; then - AC_MSG_WARN(Usage: --with-kpathsea-include=includedir) - else - CPPFLAGS="$CPPFLAGS -I${withval}" - fi - ]) - - AC_ARG_WITH(kpathsea-lib, - [ --with-kpathsea-lib=DIR location of the kpathsea lib dir],[ - if test "$withval" = "yes" -o "$withval" = "no"; then - AC_MSG_WARN(Usage: --with-kpathsea-lib=libdir) - else - LDFLAGS="$LDFLAGS -L${withval}" - fi - ]) - - 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]) - - save_LIBS="$LIBS" - if test "$kpathsea_b" != "no"; then - AC_CHECK_HEADERS([kpathsea/kpathsea.h],,kpathsea_b=no) - AC_CHECK_LIB(kpathsea, kpse_find_file) - AC_CHECK_FUNCS(kpse_find_file,,kpathsea_b=no) - if test "$kpathsea_b" = "no"; then - warn='kpathsea (libkpathsea-dev, kpathsea-devel or tetex-devel - package). - Else, please specify the directories where kpathsea/kpathsea.h and - libkpathsea.a are installed using --with-kpathsea-include and - --with-kpathsea-lib options. You should install kpathsea; see - INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea - is not available for your platform.' - STEPMAKE_ADD_ENTRY(REQUIRED, $warn) - fi - fi - - save_CFLAGS="$CFLAGS" - CFLAGS=$(echo "-shared $CFLAGS" | sed -e 's/ -g//') - AC_MSG_CHECKING([for shared libkpathsea]) - AC_TRY_LINK([#include ], - [kpse_var_expand ("\$TEXMF");], - [have_libkpathsea_so=maybe; - shared_size=`wc -c conftest$ac_exeext`; - shared_size=`echo $shared_size | sed -e 's/ .*//g'`], - [have_libkpathsea_so=no]) - - if test "$have_libkpathsea_so" = "maybe"; then - if test "$shared_size" -lt 40000 ; then - have_libkpathsea_so=yes - else - have_libkpathsea_so=no - fi - fi - - AC_MSG_RESULT($have_libkpathsea_so) - if test "$have_libkpathsea_so" = "yes"; then - AC_DEFINE(HAVE_LIBKPATHSEA_SO) - fi - CFLAGS="$save_CFLAGS" - - KPATHSEA_LIBS="$LIBS" - LIBS="$save_LIBS" - AC_MSG_CHECKING(whether to use kpathsea) - if test "$kpathsea_b" != no; then - AC_MSG_RESULT(yes) - KPATHSEA=1 - else - AC_MSG_RESULT(no) - KPATHSEA=0 - fi - - AC_SUBST(KPATHSEA) - AC_SUBST(KPATHSEA_LIBS) - AC_SUBST(HAVE_LIBKPATHSEA_SO, $have_libkpathsea_so) - AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA) -]) - - AC_DEFUN(STEPMAKE_LIB, [ STEPMAKE_PROGS(AR, ar, $1) AC_PROG_RANLIB @@ -863,8 +853,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') @@ -947,7 +936,7 @@ AC_DEFUN(STEPMAKE_PERL, [ AC_DEFUN(STEPMAKE_PYTHON, [ unset pv AC_MSG_CHECKING([for python]) - for python in $PYTHON python python2 python2.3 python2.2 python2.1 python2.0; do + for python in $PYTHON python python2 python2.4 python2.3 python2.2 python2.1 python2.0; do AC_MSG_RESULT([$python]) if ! $python -V > /dev/null 2>&1 ; then #AC_MSG_WARN([cannot execute $python]) @@ -964,35 +953,83 @@ 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) ]) AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ - unset PYTHON_HEADER PYTHON_INCLUDE - if test -n "$PYTHON"; then + AC_ARG_WITH(python-include, + [ --with-python-include=DIR + location of the python include dir],[ + if test "$withval" = "yes" -o "$withval" = "no"; then + AC_MSG_WARN(Usage: --with-python-include=includedir) + else + PYTHON_CFLAGS="-I${withval}" + fi + ]) + + AC_ARG_WITH(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 + LDFLAGS="$LDFLAGS -l${withval}" + fi + ]) + + 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\|m\)\(\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 ())' PYTHON_INCLUDE=`$PYTHON -c 'import sys; sys.stdout.write ("%s/include/python%s" % (sys.prefix, sys.version[:3]))'` + PYTHON_CFLAGS="-I$PYTHON_INCLUDE" changequote([, ])#dnl fi - ##AC_CHECK_HEADERS([Python.h],[PYTHON_HEADER=yes]) if test -z "$PYTHON_HEADER"; then - #URG -- how to extend include path? - ac_compile="$ac_compile -I$PYTHON_INCLUDE" - ac_cpp="$ac_cpp -I$PYTHON_INCLUDE" - CPPFLAGS="$CPPFLAGS -I$PYTHON_INCLUDE" + CPPFLAGS="$PYTHON_CFLAGS $CPPFLAGS" AC_CHECK_HEADERS([Python.h],[PYTHON_HEADER=yes]) fi if test -z "$PYTHON_HEADER"; then - warn="$PYTHON_INCLUDE/Python.h (python-devel, python-dev or libpython-dev package)" + warn="Python.h (python-devel, python-dev or libpython-dev package)" STEPMAKE_ADD_ENTRY($1, $warn) fi ]) + + +AC_DEFUN(STEPMAKE_STL_DATA_METHOD, [ + AC_LANG_PUSH(C++) + AC_CACHE_CHECK([for stl.data () method], + [stepmake_cv_stl_data_method], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include +using namespace std; +vector v; +void *p = v.data (); +]])], + [stepmake_cv_stl_data_method=yes], + [stepmake_cv_stl_data_method=no])) + if test $stepmake_cv_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) @@ -1000,6 +1037,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) @@ -1080,13 +1118,19 @@ AC_DEFUN(STEPMAKE_FREETYPE2, [ PKG_CHECK_MODULES(FREETYPE2, $1 >= $3, have_freetype2=yes, true) if test "$have_freetype2" = yes; then AC_DEFINE(HAVE_FREETYPE2) + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$FREETYPE2_CFLAGS $CPPFLAGS" + LIBS="$FREETYPE2_LIBS $LIBS" AC_SUBST(FREETYPE2_CFLAGS) AC_SUBST(FREETYPE2_LIBS) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" else # 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 ]) @@ -1095,13 +1139,20 @@ AC_DEFUN(STEPMAKE_GTK2, [ PKG_CHECK_MODULES(GTK2, $1 >= $3, have_gtk2=yes, true) if test "$have_gtk2" = yes ; then AC_DEFINE(HAVE_GTK2) + # Do not pollute user-CPPFLAGS with configure-CPPFLAGS + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$GTK2_CFLAGS $CPPFLAGS" + LIBS="$GTK2_LIBS $LIBS" AC_SUBST(GTK2_CFLAGS) AC_SUBST(GTK2_LIBS) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" else # 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 ]) @@ -1110,11 +1161,11 @@ AC_DEFUN(STEPMAKE_PANGO, [ PKG_CHECK_MODULES(PANGO, $1 >= $3, have_pango16=yes, true) if test "$have_pango16" = yes ; then AC_DEFINE(HAVE_PANGO16) - PANGO_CFLAGS="$PANGO_CFLAGS $GTK2_CFLAGS" - PANGO_LIBS="$PANGO_LIBS $GTK2_LIBS" # Do not pollute user-CPPFLAGS with configure-CPPFLAGS save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" + CPPFLAGS="$PANGO_CFLAGS $CPPFLAGS" + LIBS="$PANGO_LIBS $LIBS" AC_CHECK_HEADERS([pango/pangofc-fontmap.h]) AC_CHECK_FUNCS([pango_fc_font_map_add_decoder_find_func]) AC_SUBST(PANGO_CFLAGS) @@ -1125,7 +1176,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 ]) @@ -1135,8 +1186,6 @@ AC_DEFUN(STEPMAKE_PANGO_FT2, [ if test "$have_pangoft2" = yes ; then AC_DEFINE(HAVE_PANGO16) AC_DEFINE(HAVE_PANGO_FT2) - PANGO_FT2_CFLAGS="$PANGO_FT2_CFLAGS $GTK2_CFLAGS" - PANGO_FT2_LIBS="$PANGO_FT2_LIBS $GTK2_LIBS" # Do not pollute user-CPPFLAGS with configure-CPPFLAGS save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" @@ -1152,7 +1201,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 ]) @@ -1161,12 +1210,10 @@ AC_DEFUN(STEPMAKE_FONTCONFIG, [ PKG_CHECK_MODULES(FONTCONFIG, $1 >= $3, have_fontconfig=yes, true) if test "$have_fontconfig" = yes ; then AC_DEFINE(HAVE_FONTCONFIG) - FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS" - FONTCONFIG_LIBS="$FONTCONFIG_LIBS" # Do not pollute user-CPPFLAGS with configure-CPPFLAGS save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $FONTCONFIG_CFLAGS" + CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS" LIBS="$FONTCONFIG_LIBS $LIBS" AC_SUBST(FONTCONFIG_CFLAGS) AC_SUBST(FONTCONFIG_LIBS) @@ -1174,7 +1221,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 ]) @@ -1183,11 +1230,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 @@ -1197,7 +1244,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) @@ -1205,7 +1251,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