patch::: 1.5.26.jcn1

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index f363f48a1c3f060ca0eb8d579df48f80e9e7872a..082312d7413a30eea1b2f3ff52f1c1552f7260fd 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -33,6 +33,10 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
     [  --enable-debugging      compile with debugging info.  Default: on],
     [debug_b=$enableval])
 
+    AC_ARG_ENABLE(optimising,
+    [  --enable-optimising      compile with optimising.  Default: on],
+    [optimise_b=$enableval])
+
     AC_ARG_ENABLE(profiling, 
     [  --enable-profiling      compile with gprof support.  Default: off],
     [profile_b=$enableval])
@@ -65,6 +69,19 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
 
     CFLAGS="$CFLAGS $OPTIMIZE"
     CPPFLAGS=${CPPFLAGS:-""}
+
+    AC_MSG_CHECKING([for IEEE-conformance compiler flags])
+    save_cflags="$CFLAGS"
+    case "$host" in
+        alpha*-*-*)
+           dnl should do compile test?
+           AC_MSG_RESULT(-mieee)
+           CFLAGS="-mieee $CFLAGS"
+           ;;
+       *)
+           AC_MSG_RESULT([none])
+           ;;
+    esac
     AC_SUBST(cross_compiling)
     AC_SUBST(CFLAGS)
     AC_SUBST(CPPFLAGS)
@@ -146,16 +163,19 @@ AC_DEFUN(AC_STEPMAKE_END, [
 ])
 
 AC_DEFUN(AC_STEPMAKE_GXX, [
-    # ugh autoconf
-    # urg, egcs: how to check for egcs >= 1.1?
+    AC_MSG_CHECKING("g++ version")
+    cxx_version=`$CXX --version`
+    AC_MSG_RESULT("$cxx_version")
     changequote(<<, >>)dnl
-    if $CXX --version | egrep '2\.[89]' > /dev/null ||
-       $CXX --version | grep 'egcs' > /dev/null
+    # urg, egcs: how to check for egcs >= 1.1?
+    if expr "$cxx_version" : '.*2\.[89]' > /dev/null ||
+       expr "$cxx_version" : '.*egcs' > /dev/null ||
+       expr "$cxx_version" : '3\.0' > /dev/null
     changequote([, ])dnl
     then
            true
     else
-           AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9 or egcs 1.1)
+           AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9, 3.0 or egcs 1.1)
     fi
 ])
 
@@ -189,9 +209,15 @@ else {last =0}}
     then
         AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed")
     fi
+    changequote(<<, >>)dnl
+    GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'`
+    GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'`
+    changequote([, ])dnl
     GUILE_FLAGS
     AC_PATH_PROG(GUILE, guile, error)
     AC_SUBST(GUILE)
+    AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, $GUILE_MAJOR_VERSION)
+    AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, $GUILE_MINOR_VERSION)
 ])
 
 AC_DEFUN(AC_STEPMAKE_INIT, [
@@ -314,8 +340,9 @@ AC_DEFUN(AC_STEPMAKE_INIT, [
     AC_ARG_ENABLE(config,
     [  --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])
+    [CONFIGURATION=$enableval])
 
+    test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION"
     CONFIGFILE=config$CONFIGSUFFIX
     AC_SUBST(CONFIGSUFFIX)
      
@@ -414,17 +441,20 @@ dnl    fi
 AC_DEFUN(AC_STEPMAKE_KPATHSEA, [
 
     kpathsea_b=yes
+    #FIXME --with-xxx is meant for specifying a PATH too,
+    # so this should read: --enable-kpathsea,
+    # or --with-kpathsea-include=PATH --with-kpathsea-lib=PATH
     AC_ARG_WITH(kpathsea,
     [  --with-kpathsea         use kpathsea lib.  Default: on],
-    [kpathsea_b=$enableval])
+    [kpathsea_b=$with_kpathsea])
 
-    if test "$kpathsea_b" = "yes"; then        
+    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.))
     fi
     AC_MSG_CHECKING(whether to use kpathsea)
-    if test "$kpathsea_b" = yes; then
+    if test "$kpathsea_b" != no; then
         AC_MSG_RESULT(yes)
        KPATHSEA=1
     else
@@ -696,7 +726,7 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
     #
     # For now let people define these in their environments
     #
-    : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`}
+    : ${MFPLAIN_MP=`kpsewhich --format mp mfplain.mp`}
     AC_MSG_RESULT($MFPLAIN_MP)
 
     AC_MSG_CHECKING(for inimetapost flags)