X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=aclocal.m4;h=f363f48a1c3f060ca0eb8d579df48f80e9e7872a;hb=fca4c87be037355afd16d9589744e478177abf6e;hp=724a91b40b7265b18cf05aa870ad088ec47310a6;hpb=531fb17b5a9c48e8b86d62b269cb83aa3cb419db;p=lilypond.git diff --git a/aclocal.m4 b/aclocal.m4 index 724a91b40b..f363f48a1c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -3,43 +3,40 @@ 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_BIBTEX2HTML, [ + AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error) + if test "$BIBTEX2HTML" = "bib2html"; then + BIBTEX2HTML_FLAGS='$< $(@)' + else + BIBTEX2HTML_FLAGS='-o $(@D)/$(*F) $<' + fi + AC_SUBST(BIBTEX2HTML) + AC_SUBST(BIBTEX2HTML_FLAGS) +]) + + AC_DEFUN(AC_STEPMAKE_COMPILE, [ # -O is necessary to get inlining - OPTIMIZE="" CFLAGS=${CFLAGS:-""} CXXFLAGS=${CXXFLAGS:-$CFLAGS} LDFLAGS=${LDFLAGS:-""} checking_b=yes - optimise_b=no + optimise_b=yes profile_b=no debug_b=yes AC_ARG_ENABLE(checking, - [ enable-checking set runtime checks (assert calls). Default: on], + [ --enable-checking set runtime checks (assert calls). Default: on], [checking_b=$enableval] ) - # actually, the default is: tja='-O' to get inlining... - # off='' --jcn + AC_ARG_ENABLE(debugging, + [ --enable-debugging compile with debugging info. Default: on], + [debug_b=$enableval]) - #actually, that sucks. - # tja looks like a typo. Default is optimisation off. --hwn - - AC_ARG_ENABLE(optimise, - [ enable-optimise use maximal speed optimisations. Default: off], - [optimise_b=$enableval]) - AC_ARG_ENABLE(profiling, - [ enable-profiling compile with gprof support. Default: off], + [ --enable-profiling compile with gprof support. Default: off], [profile_b=$enableval]) - AC_ARG_ENABLE(debugging, - [ enable-debugging set debug info. Default: on], - [debug_b=$enableval]) - - AC_ARG_ENABLE(mingw-prefix, - [ enable-mingw-prefix=DIR set the mingw32 directory (standalone windows32 exes)], - [MINGWPREFIX=$enableval], - [MINGWPREFIX=no]) if test "$checking_b" = no; then # ugh @@ -51,9 +48,6 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ OPTIMIZE="-O2 -finline-functions" fi - if test "$optimise_b" = no; then - OPTIMIZE="" - fi if test $profile_b = yes; then EXTRA_LIBES="-pg" @@ -64,11 +58,6 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ OPTIMIZE="$OPTIMIZE -g" fi - # however, C++ support in mingw32 v 0.1.4 is still flaky - if test x$MINGWPREFIX != xno; then - ICFLAGS="-I$MINGWPREFIX/include" - ILDFLAGS="-$MINGWPREFIX/lib" - fi AC_PROG_CC LD='$(CC)' @@ -127,18 +116,29 @@ AC_DEFUN(AC_STEPMAKE_DATADIR, [ presome=${ac_default_prefix} fi DIR_DATADIR=`echo ${DIR_DATADIR} | sed "s!\\\${prefix}!$presome!"` + AC_SUBST(datadir) AC_SUBST(DIR_DATADIR) + + dnl yeah, so fuck me gently with a cactus: this doesnt belong here + dnl Please take the person responsible for inventing shell-scripts out + dnl and shoot him. On behalf of the sane world, thank you. + dnl DIR_SHAREDSTATEDIR="foobar" + dnl AC_SUBST(DIR_SHAREDSTATEDIR) + AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}") ]) AC_DEFUN(AC_STEPMAKE_END, [ AC_OUTPUT($CONFIGFILE.make:config.make.in) - rm -f $srcdir/GNUmakefile - cp $srcdir/make/toplevel.make.in $srcdir/GNUmakefile - chmod 444 $srcdir/GNUmakefile - if test "$builddir" != "."; then + # regular in-place build + # test for srcdir_build = yes ? + if test "$builddir" = "."; then + 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 @@ -229,19 +229,16 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ if test "x$PACKAGE" = "xSTEPMAKE"; then AC_MSG_RESULT(Stepmake package!) - #if test "x$builddir" != "x"; then - # builddir="../$builddir" - #else - # builddir=.. - #fi - if test "$srcdir" != "."; then + AC_MSG_CHECKING(builddir) + if test "$srcdir" = "."; then + builddir=. + else 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 + AC_MSG_RESULT($builddir) (cd stepmake 2>/dev/null || mkdir stepmake) (cd stepmake; rm -f stepmake; ln -s ../$srcdir/stepmake .) @@ -251,11 +248,20 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ else AC_MSG_RESULT($PACKAGE) - if test "$srcdir" != "."; then - absolute_builddir="`pwd`" - builddir="`dirname $srcdir`/`basename $absolute_builddir`" - else + AC_MSG_CHECKING(builddir) + 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 + fi + AC_MSG_RESULT($builddir) + if expr "$srcdir" : '/' > /dev/null 2>&1; then + absolute_srcdir=yes + AC_STEPMAKE_WARN(Absolute --srcdir specified: $srcdir) fi AC_MSG_CHECKING(for stepmake) @@ -263,9 +269,14 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ if test -d $stepmake; then AC_MSG_RESULT($stepmake) else - stepmake='$(depth)'/$srcdir/stepmake + if test "$absolute_srcdir" != "yes"; then + stepmake='$(depth)'/$srcdir/stepmake + else + stepmake=$srcdir/stepmake + fi AC_MSG_RESULT($srcdir/stepmake ($datadir/stepmake not found)) fi + AC_CONFIG_AUX_DIR(\ $HOME/usr/local/share/stepmake/bin\ $HOME/usr/local/lib/stepmake/bin\ @@ -301,7 +312,8 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ CONFIGSUFFIX= AC_ARG_ENABLE(config, - [ enable-config=FILE put configure settings in config-FILE.make], + [ --enable-config=CONF put settings in config-CONF.make and config-CONF.h; + do \`make conf=CONF' to get output in ./out-CONF], [CONFIGSUFFIX=-$enableval]) CONFIGFILE=config$CONFIGSUFFIX @@ -349,6 +361,7 @@ dnl fi ZIP="zip -r -9" # program_suffix=.exe # urg + # ROOTSEP=':' # DIRSEP='\\' # PATHSEP=';' # @@ -371,10 +384,12 @@ dnl fi # this way, you may have buildscripts/out/lilypond-profile # 'automatically' sourced from /usr/etc/profile.d/ too. # + ROOTSEP=':' DIRSEP='/' PATHSEP=':' INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else + ROOTSEP=':' DIRSEP='/' PATHSEP=':' LN=ln @@ -399,20 +414,17 @@ dnl fi AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ kpathsea_b=yes - AC_ARG_ENABLE(kpathsea, - [ enable-kpathsea use kpathsea lib. Default: on], + AC_ARG_WITH(kpathsea, + [ --with-kpathsea use kpathsea lib. Default: on], [kpathsea_b=$enableval]) - if test $kpathsea_b = yes; then + if test "$kpathsea_b" = "yes"; then AC_HAVE_HEADERS(kpathsea/kpathsea.h) AC_CHECK_LIB(kpathsea, kpse_find_file) - # urg: kpse_find_tfm is a #define, how to check for this? - # AC_CHECK_LIB(kpathsea, kpse_find_tfm) - # AC_CHECK_FUNCS(kpse_find_file kpse_find_tfm,, AC_STEPMAKE_WARN(Cannot find kpathsea functions. You may have to create TFM files manually.)) - AC_CHECK_FUNCS(kpse_find_file,, AC_STEPMAKE_WARN(Cannot find kpathsea functions. You may have to create TFM files manually.) kpathsea_b=no) + 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.)) fi AC_MSG_CHECKING(whether to use kpathsea) - if test $kpathsea_b = yes; then + if test "$kpathsea_b" = yes; then AC_MSG_RESULT(yes) KPATHSEA=1 else @@ -481,12 +493,13 @@ AC_DEFUN(AC_STEPMAKE_LOCALE, [ # with/enable ?? AC_ARG_WITH(localedir, - [ with-localedir=LOCALE use LOCALE as locale dir. Default: PREFIX/share/locale ], + [ --with-localedir=LOCALE use LOCALE as locale dir. Default: + PREFIX/share/locale ], localedir=$with_localedir, localedir='${prefix}/share/locale') AC_ARG_WITH(lang, - [ with-lang=LANG use LANG as language to emit messages], + [ --with-lang=LANG use LANG as language to emit messages], language=$with_lang, language=English) @@ -524,6 +537,32 @@ AC_DEFUN(AC_STEPMAKE_GETTEXT, [ AC_CHECK_FUNCS(gettext) ]) +AC_DEFUN(AC_STEPMAKE_MAKEINFO, [ + AC_CHECK_PROGS(MAKEINFO, makeinfo, error) + if test "$MAKEINFO" != "error"; then + AC_MSG_CHECKING(whether makeinfo can split html by @node) + mkdir -p out + makeinfo --html --output=out/split <