]> git.donarmstrong.com Git - lilypond.git/blobdiff - aclocal.m4
release: 1.3.136
[lilypond.git] / aclocal.m4
index 6bca70dc7739e4e541628c7ac47692d1c631b888..a7f2f4430052d6f57d1181a5cc88a83460cc6bc5 100644 (file)
@@ -1,6 +1,20 @@
+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_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=""
@@ -74,6 +88,7 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
 
     CFLAGS="$CFLAGS $OPTIMIZE"
     CPPFLAGS=${CPPFLAGS:-""}
+    AC_SUBST(cross_compiling)
     AC_SUBST(CFLAGS)
     AC_SUBST(CPPFLAGS)
     AC_SUBST(LDFLAGS)
@@ -124,18 +139,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
@@ -175,9 +201,15 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
     fi
     AC_MSG_CHECKING("Guile version")
     need_guile_version="1.3.4"
-    guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"`
+    need_guile_version_numeric=100304
+    guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'`
+    guile_version_numeric=`echo $guile_version | awk -F. '
+{if ([$]3) {last = [$]3}
+else {last =0}}
+{printf "%s%s%s\n",[$]1*100, [$]2*10,last}'`
     AC_MSG_RESULT("$guile_version")
-    if test "$guile_version" != "$need_guile_version"; then
+    if test $guile_version_numeric -lt $need_guile_version_numeric
+    then
         AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed")
     fi
     GUILE_FLAGS
@@ -220,19 +252,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 .)
@@ -242,11 +271,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)
@@ -254,9 +292,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\
@@ -290,12 +333,6 @@ AC_DEFUN(AC_STEPMAKE_INIT, [
     AUTOGENERATE="This file was automatically generated by configure"
     AC_SUBST(AUTOGENERATE)
 
-    STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null`
-    if test "x$STATE_VECTOR" != "x"; then
-       STATE_VECTOR="\$(depth)/$STATE_VECTOR"
-    fi
-    AC_SUBST(STATE_VECTOR)
-
     CONFIGSUFFIX=
     AC_ARG_ENABLE(config,
     [  enable-config=FILE      put configure settings in config-FILE.make],
@@ -346,6 +383,7 @@ dnl    fi
        ZIP="zip -r -9" #
        program_suffix=.exe
        # urg
+       # ROOTSEP=':'
         # DIRSEP='\\'
        # PATHSEP=';'
        #
@@ -368,10 +406,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
@@ -646,20 +686,24 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
            break;
        fi
     done
+    AC_MSG_RESULT($MFMODE)
 
+    AC_MSG_CHECKING(for mfplain.mp)
     #
     # For now let people define these in their environments
     #
     : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`}
+    AC_MSG_RESULT($MFPLAIN_MP)
 
+    AC_MSG_CHECKING(for inimetapost flags)
     if test  ${INIMETAPOST} = "inimp" ; then
        : ${INIMETAPOST_FLAGS=''}
     else
        : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
     fi
+    AC_MSG_RESULT($INIMETAPOST_FLAGS)
 
     rm -f mfput.*
-    AC_MSG_RESULT($MFMODE)
 
     AC_SUBST(METAFONT)
     AC_SUBST(METAPOST)