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)
do `make conf=CONF' to get output in ./out-CONF],
[CONFIGURATION=$enableval])
- ##'
+ ##'`#
test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION"
CONFIGFILE=config$CONFIGSUFFIX
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)
])
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)
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