patch::: 1.1.20.jcn2: Re: patsje

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 15d012b7a4d0094113e7eb7b46d8d639f0e1ba18..c6bcc95f0811c63a4526207c964a4c0f09c4e8df 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -267,10 +267,9 @@ AC_DEFUN(AC_STEPMAKE_INIT, [
     AC_SUBST(CONFIGSUFFIX)
      
     AC_CANONICAL_HOST
-    AC_CHECK_PROGS(MAKE, make, error)
+    AC_CHECK_PROGS(MAKE, make gmake, 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
@@ -283,10 +282,8 @@ 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) 
@@ -450,6 +447,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, [