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
# 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 */]])],
alpha*-*-*)
dnl should do compile test?
AC_MSG_RESULT(-mieee)
- CFLAGS="-mieee $CFLAGS"
+ CFLAGS=" -mieee $CFLAGS"
;;
*)
AC_MSG_RESULT([none])
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!"`
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}"])
mkdir -p $(dirname $mf)
cat <<EOF | $PYTHON - > $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 <<EOF | $PYTHON - > $mf
-print 'include \$(depth)/config.make'
+print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make'
print 'include \$(configure-srcdir)/$mf'
EOF
done
cat <<EOF > GNUmakefile
depth = ./
-include config.make
+include config\$(if \$(conf),-\$(conf),).make
include \$(configure-srcdir)/GNUmakefile.in
EOF
AC_SUBST(VPATH)
AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [
- AC_MSG_CHECKING([FlexLexer.h path])
+ AC_MSG_CHECKING([FlexLexer.h location])
# ugh.
cat <<EOF > conftest.cc
using namespace std;
#include <FlexLexer.h>
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, [
(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)
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.
- 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)
AC_SUBST(stepmake)
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
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)
])
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
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 <kpathsea/kpathsea.h>],
[kpse_var_expand ("\$TEXMF");],
# 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')
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_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
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])
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)
# 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
])
# 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
])
# 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
])
# 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
])
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
])
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
AC_SUBST(LN)
AC_SUBST(LN_S)
- AC_SUBST(INSTALL)
AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}'])
AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}'])
AC_SUBST(DIRSEP)
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
projects / lilypond.git / blobdiff