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 -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])
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, [
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)
])
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!\\\${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}"])
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!"`
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 <<EOF
+Source directory already configured. Please clean the source directory
+
+ make -C $srcdir distclean
+
+and rerun configure.
+EOF
+ exit 2
+ fi
+
+ for d in 2 3 4 ; do
+ for mf in `cd $srcdir ; find -maxdepth $d -mindepth $d -name GNUmakefile`; do
+ mkdir -p $(dirname $mf)
+ cat <<EOF | $PYTHON - > $mf
+print 'depth=' + ('../' * ( $d-1 ) )
+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\$(if \$(conf),-\$(conf),).make'
+print 'include \$(configure-srcdir)/$mf'
+EOF
+ done
+ done
+
+
+ cat <<EOF > GNUmakefile
+depth = ./
+include config\$(if \$(conf),-\$(conf),).make
+include \$(configure-srcdir)/GNUmakefile.in
+EOF
+ AC_SUBST(VPATH)
fi
])
AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [
- AC_MSG_CHECKING([FlexLexer.h path])
-
- # ugh.
- FLEXLEXER_PATH=`echo '#include <FlexLexer.h>' | $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 <<EOF > conftest.cc
+using namespace std;
+#include <FlexLexer.h>
+EOF
+ 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_FILE)
+ AC_MSG_RESULT($FLEXLEXER_FILE)
])
AC_DEFUN(STEPMAKE_GCC, [
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
(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 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.
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
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)
+ STEPMAKE_ADD_ENTRY(OPTIONAL, $warn)
fi
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')
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])
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
+ ])
+
+ if test "$cross_compiling" = "no" -a -z "$PYTHON_CFLAGS"; 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 "$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
- #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_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)
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
])
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
])
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)
# 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
])
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"
# 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
])
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)
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