Fix up some autoconf macros to get freebsd builds working again.

Merge of master-melb:xfs-cmds:21750a by kenmcd.

diff --git a/aclocal.m4 b/aclocal.m4
index fb64cd5b9001459344b17b531ade81d214dceb14..45a41d52376bd9e65e4142bb5ad8dba74ab2b022 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -82,7 +82,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
 
     if test -z "$MAKE"; then
-        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/freeware/bin)
+        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
     fi
     if test -z "$MAKE"; then
         AC_PATH_PROG(MAKE, make,, /usr/bin)

diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
index c06fde2f31d18b5e1569f319b44bc7c8c012fb78..efcc0a104dacfbccb5774d19d3d61f746a6acd14 100644 (file)
--- a/m4/package_utilies.m4
+++ b/m4/package_utilies.m4
@@ -23,7 +23,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
 
     if test -z "$MAKE"; then
-        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/freeware/bin)
+        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
     fi
     if test -z "$MAKE"; then
         AC_PATH_PROG(MAKE, make,, /usr/bin)