patch::: 1.4.0.jcn5

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index b5684b86ada85f9c6747714eb952b96282e42eed..d313deb9c8e8180febefacbe3d0efcbc51f5eb75 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -15,12 +15,11 @@ AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [
 
 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
 
@@ -32,19 +31,10 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
     [  --enable-debugging      compile with debugging info.  Default: on],
     [debug_b=$enableval])
 
-    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],
     [profile_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
@@ -56,9 +46,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"
@@ -69,11 +56,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)'
@@ -434,16 +416,13 @@ AC_DEFUN(AC_STEPMAKE_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
@@ -556,6 +535,29 @@ AC_DEFUN(AC_STEPMAKE_GETTEXT, [
     AC_CHECK_FUNCS(gettext)
 ])
 
+AC_DEFUN(AC_STEPMAKE_MAKEINFO, [
+    AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
+    AC_MSG_CHECKING(whether makeinfo can split html by @node)
+    makeinfo --html --output=out/split <<EOF
+\input texinfo
+\input texinfo @c -*-texinfo-*-
+@setfilename split.info
+@settitle split.info
+@bye
+EOF
+    if test -d out/split; then
+       SPLITTING_MAKEINFO=yes
+       AC_MSG_RESULT(yes)
+       rm -rf out/split
+    else
+       AC_MSG_RESULT(no)
+       AC_STEPMAKE_WARN(your html documentation will be one large file)
+       rm -rf out/split
+    fi
+    AC_SUBST(SPLITTING_MAKEINFO)
+])
+
+
 AC_DEFUN(AC_STEPMAKE_MAN, [
     AC_CHECK_PROGS(GROFF, groff ditroff, -echo no groff)
     AC_CHECK_PROGS(TROFF, troff, -echo no troff)