dnl aclocal.m4 -*-shell-script-*-
dnl WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
+dnl do not edit! this is aclocal.m4, generated from /home/hanwen/usr/src/lilypond/stepmake/aclocal.m4
dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
[debug_b=$enableval])
AC_ARG_ENABLE(optimising,
- [ --enable-optimising compile with optimising. Default: on],
+ [ --enable-optimising compile with optimising. Default: on],
[optimise_b=$enableval])
AC_ARG_ENABLE(profiling,
AC_DEFUN(STEPMAKE_DATADIR, [
if test "$datadir" = "\${prefix}/share"; then
- datadir='${prefix}/share/'$package/$FULL_VERSION
+ datadir='${prefix}/share'
fi
- DIR_DATADIR=${datadir}
presome=${prefix}
if test "$prefix" = "NONE"; then
- presome=${ac_default_prefix}
+ presome=${ac_default_prefix}
fi
- DIR_DATADIR=`echo ${DIR_DATADIR} | sed "s!\\\${prefix}!$presome!"`
-
- AC_SUBST(datadir)
- AC_SUBST(DIR_DATADIR)
-
- # we used to set DIR_SHAREDSTATEDIR here,
- # but apparently that broke something
- AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}")
+ package_datadir=$datadir/$package
+ local_package_datadir=$package_datadir/$FULL_VERSION
+ build_package_datadir=$builddir/share/$package
+
+ DATADIR=$(echo ${datadir} | sed "s!\\\${prefix}!$presome!")
+ PACKAGE_DATADIR=$(echo ${package_datadir} | sed "s!\\\${prefix}!$presome!")
+ LOCAL_PACKAGE_DATADIR=$(echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!")
+ BUILD_PACKAGE_DATADIR=$(echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!")
+
+ AC_SUBST(datadir)
+ AC_SUBST(package_datadir)
+ AC_SUBST(local_package_datadir)
+ AC_SUBST(build_package_datadir)
+ AC_DEFINE_UNQUOTED(DATADIR, "${DATADIR}")
+ AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, "${PACKAGE_DATADIR}")
+ AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_DATADIR, "${LOCAL_PACKAGE_DATADIR}")
+ AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, "${BUILD_PACKAGE_DATADIR}")
])
# regular in-place build
# test for srcdir_build = yes ?
- if test "$builddir" = "."; then
+ if test "$srcdir_build" = "yes"; then
rm -f $srcdir/GNUmakefile
cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile
chmod 444 $srcdir/GNUmakefile
AC_DEFUN(STEPMAKE_GETTEXT, [
- DIR_LOCALEDIR=${localedir}
presome=${prefix}
if test "$prefix" = "NONE"; then
presome=${ac_default_prefix}
fi
- DIR_LOCALEDIR=`echo ${DIR_LOCALEDIR} | sed "s!\\\${prefix}!$presome!"`
+ LOCALEDIR=$(echo ${localedir} | sed "s!\\\${prefix}!$presome!")
+
AC_SUBST(localedir)
- AC_SUBST(DIR_LOCALEDIR)
- AC_DEFINE_UNQUOTED(DIR_LOCALEDIR, "${DIR_LOCALEDIR}")
-
+ AC_DEFINE_UNQUOTED(LOCALEDIR, "${LOCALEDIR}")
AC_CHECK_LIB(intl, gettext)
AC_CHECK_FUNCS(gettext)
])
fi
AC_MSG_CHECKING(Package)
- if test "x$PACKAGE" = "xSTEPMAKE"; then
+ if test "$PACKAGE" = "STEPMAKE"; then
AC_MSG_RESULT(Stepmake package!)
AC_MSG_CHECKING(builddir)
+
+ builddir="`pwd`"
+
if test "$srcdir" = "."; then
- builddir=.
+ srcdir_build=yes
else
- absolute_builddir="`pwd`"
- package_absolute_builddir="`dirname $absolute_builddir`"
+ srcdir_build=no
+ package_builddir="`dirname $builddir`"
package_srcdir="`dirname $srcdir`"
- builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`"
fi
AC_MSG_RESULT($builddir)
AC_MSG_RESULT($PACKAGE)
AC_MSG_CHECKING(builddir)
+ builddir="`pwd`"
if test "$srcdir" = "."; then
- builddir=.
- srcdir_build=no
- else
- absolute_builddir="`pwd`"
-# builddir="`dirname $srcdir`/`basename $absolute_builddir`"
- builddir="`bash $srcdir/buildscripts/walk.sh \"$srcdir\"`"
srcdir_build=yes
+ else
+ srcdir_build=no
fi
AC_MSG_RESULT($builddir)
- if expr "$srcdir" : '/' > /dev/null 2>&1; then
- absolute_srcdir=yes
- STEPMAKE_WARN(Absolute --srcdir specified: $srcdir)
- fi
AC_MSG_CHECKING(for stepmake)
# Check for installed stepmake
if test -d $stepmake; then
AC_MSG_RESULT($stepmake)
else
- if test "$absolute_srcdir" != "yes"; then
- stepmake='$(depth)'/$srcdir/stepmake
- else
- stepmake=$srcdir/stepmake
- fi
+ stepmake="`cd $srcdir/stepmake; pwd`"
AC_MSG_RESULT($srcdir/stepmake ($datadir/stepmake not found))
fi
AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}")
AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
- if test "$package_depth" = "" ; then
+ if test -z "$package_depth"; then
package_depth="."
else
package_depth="../$package_depth"
STEPMAKE_DATADIR
])
-
+
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
#FIXME --with-xxx is meant for specifying a PATH too,
# so this should read: --enable-kpathsea,
if test "$kpathsea_b" != "no"; then
AC_HAVE_HEADERS(kpathsea/kpathsea.h)
AC_CHECK_LIB(kpathsea, kpse_find_file)
- AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions. You should install kpathsea; see INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform.))
+ AC_CHECK_FUNCS(kpse_find_file,,kpathsea_b=no)
+ if test "$kpathsea_b" = "no"; then
+ warn='kpathsea (libkpathsea-dev or kpathsea-devel package)
+ Else, please specify the location of your kpathsea using
+ --with-kpathea-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)
+ fi
fi
AC_MSG_CHECKING(whether to use kpathsea)
if test "$kpathsea_b" != no; then
projects / lilypond.git / blobdiff