## -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\}' \
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}"])
using namespace std;
#include <FlexLexer.h>
EOF
- FLEXLEXER_FILE=`$CXX -E conftest.cc | \
+ FLEXLEXER_FILE=`eval $ac_cpp 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)
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
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)
])
fi
])
- if test "$cross_compiling" = "no" -a -z "$PYTHON_CFLAGS"; then
+ 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\)\(\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 ())'
fi
])
+
+
AC_DEFUN(STEPMAKE_STL_DATA_METHOD, [
AC_LANG_PUSH(C++)
AC_CACHE_CHECK([for stl.data () method],
#include <vector>
using namespace std;
vector <int> v;
-(void) v.data ();
+void *p = v.data ();
]])],
[stepmake_stl_data_method=yes],
[stepmake_stl_data_method=no]))
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)
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(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