patch::: 1.1.25.jcn1: jcn1

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 46b9e1839eecc088acb67b1fe009ca9d39cd9dc0..cb1ebe6cc0905d0eb8a22c6417657cac4d614962 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,9 @@
 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
 
@@ -79,7 +83,9 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
     LD='$(CC)'
     AC_SUBST(LD)
 
+    CFLAGS="$CFLAGS $OPTIMIZE"
     CPPFLAGS=${CPPFLAGS:-""}
+    AC_SUBST(CFLAGS)
     AC_SUBST(CPPFLAGS)
     AC_SUBST(LDFLAGS)
     AC_SUBST(ICFLAGS)
@@ -144,14 +150,15 @@ AC_DEFUN(AC_STEPMAKE_END, [
 
 AC_DEFUN(AC_STEPMAKE_GXX, [
     # ugh autoconf
+    # urg, egcs: how to check for egcs >= 1.1?
     changequote(<<, >>)dnl
-    if $CXX --version | grep '2\.[78]' > /dev/null ||
+    if $CXX --version | grep '2\.8' > /dev/null ||
        $CXX --version | grep 'egcs' > /dev/null
     changequote([, ])dnl
     then
            true
     else
-           AC_STEPMAKE_WARN(can\'t find g++ 2.7, 2.8 or egcs)
+           AC_STEPMAKE_WARN(can\'t find g++ 2.8 or egcs 1.1)
     fi
 ])
 
@@ -160,17 +167,19 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
     # others need readline, dl (or even more)
     # urg, must check for different functions in libguile
     # to force new check iso reading from cache
-    AC_CHECK_LIB(guile, scm_shell, \
+
+    # gh_scm2doubles,gh_doubles2scm are new in 1.3
+    AC_CHECK_LIB(guile, gh_scm2doubles, \
       LIBS="-lguile $LIBS"; AC_DEFINE(HAVE_LIBGUILE), \
       AC_CHECK_LIB(readline, readline) \
       AC_CHECK_LIB(dl, dlopen) \
       AC_CHECK_LIB(socket, socket)\
       AC_CHECK_LIB(termcap,tgetent)\
       AC_CHECK_LIB(m, fabs)\
-      AC_CHECK_LIB(guile, scm_boot_guile)\
+      AC_CHECK_LIB(guile, gh_doubles2scm)\
     )
-    if test "$ac_cv_lib_guile_scm_shell" != yes -a \
-      "$ac_cv_lib_scm_boot_guile" != yes ; then
+    if test "$ac_cv_lib_guile_gh_scm2doubles" != yes -a \
+      "$ac_cv_lib_guile_gh_doubles2scm" != yes ; then
            AC_STEPMAKE_WARN(You should install guile 1.3 or newer)
     fi
 ])
@@ -260,10 +269,9 @@ AC_DEFUN(AC_STEPMAKE_INIT, [
     AC_SUBST(CONFIGSUFFIX)
      
     AC_CANONICAL_HOST
-    AC_CHECK_PROGS(MAKE, make, error)
+    AC_CHECK_PROGS(MAKE, gmake make, error)
     AC_CHECK_PROGS(FIND, find, error)
 
-
 dnl system supplied INSTALL is unsafe; use our own install.
 dnl    AC_PROG_INSTALL
 dnl    if test "$INSTALL" = "bin/install-sh"; then
@@ -276,14 +284,12 @@ dnl    fi
     AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python)
     AC_SUBST(PYTHON)
 
-
-    AC_CHECK_SEARCH_RESULT($MAKE, GNU make,  You should install GNU make)
     if test $MAKE != "error" ; then
-       $MAKE -v| grep GNU > /dev/null
+       $MAKE -v 2> /dev/null | grep GNU > /dev/null
        if test "$?" = 1
        then
                AC_STEPMAKE_WARN(Please install *GNU* make) 
-       fi 
+       fi
     fi 
 
     AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python)
@@ -293,9 +299,32 @@ dnl    fi
        LN_S=cp # symbolic link does not work for native nt
        ZIP="zip -r -9" #
        DOTEXE=.exe
-       DIRSEP='\\'
-       PATHSEP=';'
-       INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c"
+       # urg
+        # DIRSEP='\\'
+       # PATHSEP=';'
+       #
+       # cygwin fixes all these things.  
+       # it seems these were used because of dos-style TEXINPUTS and
+       # MFINPUTS needed for miktex.
+       # but this breaks parsing of all other cygwin/unix style paths.
+       #
+       # if your (mik)tex breaks, make a:
+       #    /usr/local/bin/tex:
+       #    #!/bin/sh
+       #    TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex $*
+       #
+       # and
+       #
+       #    /usr/local/bin/mf:
+       #    #!/bin/sh
+       #    MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf $*
+       #
+       # this way, you may have buildscripts/out/lilypond-profile 
+       # 'automatically' sourced from /usr/etc/profile.d/ too.
+       #
+        DIRSEP='/'
+       PATHSEP=':'
+       INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c"
     else
        DIRSEP='/'
        PATHSEP=':'
@@ -420,6 +449,7 @@ AC_DEFUN(AC_STEPMAKE_GETTEXT, [
 
 AC_DEFUN(AC_STEPMAKE_MAN, [
     AC_CHECK_PROGS(TROFF, troff, -echo no troff)
+    AC_CHECK_PROGS(TBL, tbl, cat)
 ])
 
 AC_DEFUN(AC_STEPMAKE_MSGFMT, [