## -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]*\).*/\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!\\\${datarootdir}!${prefix}/share!"`
- DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
+ DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"`
BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
AC_SUBST(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' ` 1> /dev/null 2> /dev/null
rm conftest.cc
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
])
-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
- AC_ARG_ENABLE(kpathsea,
- [ --enable-kpathsea use kpathsea lib. Default: on],
- [kpathsea_b=$enableval])
-
- 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
- STEPMAKE_ADD_ENTRY(OPTIONAL, $warn)
- fi
- fi
-
- save_CFLAGS="$CFLAGS"
- 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");],
- [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
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\|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 ())'
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])
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)
projects / lilypond.git / blobdiff