-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
AC_DEFUN(AC_STEPMAKE_COMPILE, [
# -O is necessary to get inlining
OPTIMIZE=""
- CXXFLAGS=${CXXFLAGS:-""}
CFLAGS=${CFLAGS:-""}
+ CXXFLAGS=${CXXFLAGS:-$CFLAGS}
+ LDFLAGS=${LDFLAGS:-""}
checking_b=yes
optimise_b=no
profile_b=no
[MINGWPREFIX=$enableval],
[MINGWPREFIX=no])
- if test "$printing_b" = no; then
- # ugh
- AC_DEFINE(NPRINT)
- DEFINES="$DEFINES -DNPRINT"
- fi
-
if test "$checking_b" = no; then
# ugh
AC_DEFINE(NDEBUG)
CPPFLAGS="$CPPFLAGS $DEFINES"
CXXFLAGS="$CXXFLAGS $OPTIMIZE"
- LDFLAGS=$EXTRA_LIBES
+ LDFLAGS="$LDFLAGS $EXTRA_LIBES"
AC_SUBST(CXXFLAGS)
AC_SUBST(CXX)
AC_DEFUN(AC_STEPMAKE_END, [
AC_OUTPUT($CONFIGFILE.make:config.make.in)
- rm -f GNUmakefile
- cp make/toplevel.make.in ./GNUmakefile
- chmod 444 GNUmakefile
+ rm -f $srcdir/GNUmakefile
+ cp $srcdir/make/toplevel.make.in $srcdir/GNUmakefile
+ chmod 444 $srcdir/GNUmakefile
+ if test "$builddir" != "."; then
+ rm -f GNUmakefile
+ cp $srcdir/make/srcdir.make.in GNUmakefile
+ chmod 444 GNUmakefile
+ fi
])
AC_DEFUN(AC_STEPMAKE_GXX, [
# ugh autoconf
# urg, egcs: how to check for egcs >= 1.1?
changequote(<<, >>)dnl
- if $CXX --version | egrep '2\.8|2\.9' > /dev/null ||
+ if $CXX --version | egrep '2\.[89]' > /dev/null ||
$CXX --version | grep 'egcs' > /dev/null
changequote([, ])dnl
then
])
AC_DEFUN(AC_STEPMAKE_GUILE, [
- # on some systems, -lguile succeeds for guile-1.3
- # others need readline, dl (or even more)
- # urg, must check for different functions in libguile
- # to force new check iso reading from cache
-
- # gh_scm2doubles,gh_doubles2scm are new in 1.3
- GUILE_FLAGS
- AC_CHECK_LIB(guile, gh_scm2doubles,
- [LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[/-_a-zA-Z0-9]]\+ //g'` $LIBS"
- AC_DEFINE(HAVE_LIBGUILE)], , $GUILE_LDFLAGS dnl
- )
- if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then
- AC_STEPMAKE_WARN(You should install guile 1.3 or newer)
+ ## First, let's just see if we can find Guile at all.
+ AC_MSG_CHECKING("for guile-config")
+ for guile_config in guile-config $target-guile-config $build-guile-config; do
+ AC_MSG_RESULT("$guile_config")
+ if ! $guile_config --version > /dev/null 2>&1 ; then
+ AC_MSG_WARN("cannot execute $guile_config")
+ AC_MSG_CHECKING("if we are cross compiling")
+ guile_config=error
+ else
+ break
+ fi
+ done
+ if test "$guile_config" = "error"; then
+ AC_MSG_ERROR("cannot find guile-config; is Guile installed?")
+ exit 1
+ fi
+ AC_MSG_CHECKING("Guile version")
+ need_guile_version="1.3.4"
+ guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"`
+ AC_MSG_RESULT("$guile_version")
+ if test "$guile_version" != "$need_guile_version"; then
+ AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed")
fi
+ GUILE_FLAGS
+ AC_PATH_PROG(GUILE, guile, error)
+ AC_SUBST(GUILE)
])
AC_DEFUN(AC_STEPMAKE_INIT, [
fi
stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"`
+ # urg, how is this supposed to work?
+ if test "$program_prefix" = "NONE"; then
+ program_prefix=
+ fi
+ if test "$program_suffix" = "NONE"; then
+ program_suffix=
+ fi
+
AC_MSG_CHECKING(Package)
if test "x$PACKAGE" = "xSTEPMAKE"; then
AC_MSG_RESULT(Stepmake package!)
- (cd stepmake; rm -f stepmake; ln -s ../stepmake .)
- (cd stepmake; rm -f bin; ln -s ../bin .)
+
+ #if test "x$builddir" != "x"; then
+ # builddir="../$builddir"
+ #else
+ # builddir=..
+ #fi
+ if test "$srcdir" != "."; then
+ absolute_builddir="`pwd`"
+ package_absolute_builddir="`dirname $absolute_builddir`"
+ package_srcdir="`dirname $srcdir`"
+ builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`"
+ else
+ builddir=.
+ fi
+
+ (cd stepmake 2>/dev/null || mkdir stepmake)
+ (cd stepmake; rm -f stepmake; ln -s ../$srcdir/stepmake .)
+ (cd stepmake; rm -f bin; ln -s ../$srcdir/bin .)
AC_CONFIG_AUX_DIR(bin)
stepmake=stepmake
else
AC_MSG_RESULT($PACKAGE)
+
+ if test "$srcdir" != "."; then
+ absolute_builddir="`pwd`"
+ builddir="`dirname $srcdir`/`basename $absolute_builddir`"
+ else
+ builddir=.
+ fi
+
AC_MSG_CHECKING(for stepmake)
# Check for installed stepmake
if test -d $stepmake; then
AC_MSG_RESULT($stepmake)
else
- stepmake='$(depth)'/stepmake
- AC_MSG_RESULT(./stepmake ($datadir/stepmake not found))
+ stepmake='$(depth)'/$srcdir/stepmake
+ AC_MSG_RESULT($srcdir/stepmake ($datadir/stepmake not found))
fi
AC_CONFIG_AUX_DIR(\
$HOME/usr/local/share/stepmake/bin\
/usr/share/stepmake/bin\
/usr/lib/stepmake/bin\
stepmake/bin\
+ $srcdir/stepmake/bin\
)
fi
+ AC_SUBST(builddir)
AC_SUBST(stepmake)
AC_SUBST(package)
AC_SUBST(PACKAGE)
AUTOGENERATE="This file was automatically generated by configure"
AC_SUBST(AUTOGENERATE)
- absolute_builddir="`pwd`"
- AC_SUBST(absolute_builddir)
STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null`
if test "x$STATE_VECTOR" != "x"; then
CONFIGSUFFIX=
AC_ARG_ENABLE(config,
[ enable-config=FILE put configure settings in config-FILE.make],
- [CONFIGSUFFIX=$enableval])
+ [CONFIGSUFFIX=-$enableval])
- if test "$CONFIGSUFFIX" != "" ; then
- CONFIGFILE=config-$CONFIGSUFFIX
- else
- CONFIGFILE=config
- fi
+ CONFIGFILE=config$CONFIGSUFFIX
AC_SUBST(CONFIGSUFFIX)
AC_CANONICAL_HOST
LN=cp # hard link does not work under cygnus-nt
LN_S='cp -r' # symbolic link does not work for native nt
ZIP="zip -r -9" #
- DOTEXE=.exe
+ program_suffix=.exe
# urg
# DIRSEP='\\'
# PATHSEP=';'
ZIP="zip -r -9"
INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c"
fi
- AC_SUBST(DOTEXE)
+ AC_SUBST(program_prefix)
+ AC_SUBST(program_suffix)
AC_SUBST(ZIP)
AC_SUBST(LN)
AC_SUBST(LN_S)
AC_SUBST(PATHSEP)
AC_SUBST(DIRSEP)
-
AC_STEPMAKE_DATADIR
])
break;
fi
done
+
+ #
+ # For now let people define these in their environments
+ #
+ : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`}
+
+ if test ${INIMETAPOST} = "inimp" ; then
+ : ${INIMETAPOST_FLAGS=''}
+ else
+ : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
+ fi
+
rm -f mfput.*
AC_MSG_RESULT($MFMODE)
AC_SUBST(MFMODE)
AC_SUBST(INIMETAFONT)
AC_SUBST(INIMETAPOST)
+ AC_SUBST(MFPLAIN_MP)
+ AC_SUBST(INIMETAPOST_FLAGS)
])
AC_DEFUN(AC_STEPMAKE_WARN, [
AC_DEFUN([GUILE_FLAGS],[
## The GUILE_FLAGS macro.
- ## First, let's just see if we can find Guile at all.
AC_MSG_CHECKING(for Guile)
- guile-config link > /dev/null || {
- echo "configure: cannot find guile-config; is Guile installed?" 1>&2
- exit 1
- }
- GUILE_CFLAGS="`guile-config compile`"
- GUILE_LDFLAGS="`guile-config link`"
+ if ! $guile_config link > /dev/null ; then
+ AC_MSG_RESULT("cannot execute $guile_config")
+ AC_MSG_ERROR("cannot find guile-config; is Guile installed?")
+ exit 1
+ fi
+ GUILE_CFLAGS="`$guile_config compile`"
+ GUILE_LDFLAGS="`$guile_config link`"
AC_SUBST(GUILE_CFLAGS)
AC_SUBST(GUILE_LDFLAGS)
AC_MSG_RESULT(yes)
projects / lilypond.git / blobdiff