]> git.donarmstrong.com Git - lilypond.git/blobdiff - aclocal.m4
patch::: 1.3.106.jcn2
[lilypond.git] / aclocal.m4
index c3aad4ba2156cf7a7040ad330f7cefe9f567adfc..724a91b40b7265b18cf05aa870ad088ec47310a6 100644 (file)
@@ -1,9 +1,5 @@
 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 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
 
@@ -80,6 +76,7 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
 
     CFLAGS="$CFLAGS $OPTIMIZE"
     CPPFLAGS=${CPPFLAGS:-""}
+    AC_SUBST(cross_compiling)
     AC_SUBST(CFLAGS)
     AC_SUBST(CPPFLAGS)
     AC_SUBST(LDFLAGS)
@@ -138,9 +135,14 @@ AC_DEFUN(AC_STEPMAKE_DATADIR, [
 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, [
@@ -153,15 +155,43 @@ AC_DEFUN(AC_STEPMAKE_GXX, [
     then
            true
     else
-           AC_STEPMAKE_WARN(can\'t find g++ 2.8 or egcs 1.1)
+           AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9 or egcs 1.1)
     fi
 ])
 
 AC_DEFUN(AC_STEPMAKE_GUILE, [
-    GUILE_FLAGS
-    if guile-config --version 2>&1 | grep -q 'version 1\.[012]'; then
-       AC_STEPMAKE_WARN(Guile version 1.3 or better needed)
+    ## 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"
+    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_numeric -lt $need_guile_version_numeric
+    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, [
@@ -187,22 +217,54 @@ 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\
@@ -214,9 +276,11 @@ AC_DEFUN(AC_STEPMAKE_INIT, [
          /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)
@@ -234,25 +298,13 @@ AC_DEFUN(AC_STEPMAKE_INIT, [
 
     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
-       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],
-    [CONFIGSUFFIX=$enableval])
+    [CONFIGSUFFIX=-$enableval])
 
-    if test "$CONFIGSUFFIX" != "" ; then
-       CONFIGFILE=config-$CONFIGSUFFIX
-    else
-       CONFIGFILE=config
-    fi
+    CONFIGFILE=config$CONFIGSUFFIX
     AC_SUBST(CONFIGSUFFIX)
      
     AC_CANONICAL_HOST
@@ -295,7 +347,7 @@ dnl    fi
        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=';'
@@ -330,7 +382,8 @@ dnl    fi
        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)
@@ -343,6 +396,34 @@ dnl    fi
     AC_STEPMAKE_DATADIR
 ])
 
+AC_DEFUN(AC_STEPMAKE_KPATHSEA, [
+
+    kpathsea_b=yes
+    AC_ARG_ENABLE(kpathsea,
+    [  enable-kpathsea         use kpathsea lib.  Default: on],
+    [kpathsea_b=$enableval])
+
+    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)
+    fi
+    AC_MSG_CHECKING(whether to use kpathsea)
+    if test $kpathsea_b = yes; then
+        AC_MSG_RESULT(yes)
+       KPATHSEA=1
+    else
+        AC_MSG_RESULT(no)
+       KPATHSEA=0
+    fi
+
+    AC_SUBST(KPATHSEA)
+    AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA)
+])
+
 AC_DEFUN(AC_STEPMAKE_LEXYACC, [
     # ugh, automake: we want (and check for) bison
     AC_PROG_YACC
@@ -470,7 +551,7 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [
 #why has this been dropped?
 AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [
     AC_ARG_ENABLE(tex-prefix,
-    [  enable-tex-prefix=DIR   set the tex-directory to find TeX subdirectories. (default: PREFIX)],
+    [  enable-tex-prefix=DIR   set the tex-directory to find TeX subdirectories.  Default: PREFIX],
     [TEXPREFIX=$enableval],
     [TEXPREFIX=auto] )
     
@@ -503,26 +584,33 @@ AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [
 ])
 
 AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [
-    AC_ARG_ENABLE(tex-tfmdir,
-    [  enable-tex-tfmdir=DIR   set the tex-directory where cmr10.tfm lives (default: use kpsewhich)],
-    [TFMDIR=$enableval],
-    [TFMDIR=auto] )
+    AC_ARG_ENABLE(tfm-path,
+    [  enable-tfm-path=PATH    set path of tex directories where tfm files live, esp.: cmr10.tfm.  Default: use kpsewhich],
+    [tfm_path=$enableval],
+    [tfm_path=auto] )
 
     AC_CHECK_PROGS(KPSEWHICH, kpsewhich, no)
-    AC_MSG_CHECKING(for TeX TFM directory)
-    if test "x$TFMDIR" = xauto ; then
-       if test "x$TEX_TFMDIR" = "x" ; then
-           if test "x$KPSEWHICH" != "xno" ; then
-               CMR10=`kpsewhich tfm cmr10.tfm`
-               TEX_TFMDIR=`dirname $CMR10`
-           else
-               AC_STEPMAKE_WARN(Please set TEX_TFMDIR (to where cmr10.tfm lives):
-       TEX_TFMDIR=/usr/local/TeX/lib/tex/fonts ./configure)
-           fi
+    AC_MSG_CHECKING(for tfm path)
+
+    TFM_FONTS="cmr msam"
+
+    if test "x$tfm_path" = xauto ; then
+       if test "x$KPSEWHICH" != "xno" ; then
+           for i in $TFM_FONTS; do
+               dir=`$KPSEWHICH tfm ${i}10.tfm`
+               TFM_PATH="$TFM_PATH `dirname $dir`"
+           done
+       else
+           AC_STEPMAKE_WARN(Please specify where cmr10.tfm lives:
+    ./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts)
        fi
+    else
+         TFM_PATH=$tfm_path
     fi
-    AC_MSG_RESULT($TEX_TFMDIR)
-    AC_SUBST(TEX_TFMDIR)
+
+    TFM_PATH=`echo $TFM_PATH | tr ':' ' '`
+    AC_MSG_RESULT($TFM_PATH)
+    AC_SUBST(TFM_PATH)
 ])
 
 AC_DEFUN(AC_STEPMAKE_TEXMF, [
@@ -561,15 +649,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`}
-    : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
+    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)
@@ -637,7 +734,7 @@ AC_DEFUN(AC_TEX_PREFIX, [
     
     if test "x$find_texpostfix" = x; then
        find_texpostfix='/lib/texmf/tex'
-       AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix)
+       AC_STEPMAKE_WARN(Cannot determine the TeX-directory.  Please use --enable-tex-prefix)
     fi
 
     find_texprefix="$find_root_prefix/$find_texpostfix"
@@ -665,7 +762,7 @@ AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [
 
     if test "x$find_dirdir" = x; then
        find_dirdir="/$3";
-       AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line)
+       AC_STEPMAKE_WARN(Cannot determine $4 subdirectory.  Please set from command-line)
        true
     fi
     $2=$find_dirdir
@@ -735,14 +832,14 @@ dnl             find the libraries.
 
 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)