Move checks for make inside function.

diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4
index f497684453982e89f6dbe1ef8023eaf30e61371c..a7609693febadb3d597c6aa5c6cc6ed9b303dda8 100644 (file)
--- a/source4/build/m4/check_make.m4
+++ b/source4/build/m4/check_make.m4
@@ -6,14 +6,26 @@ dnl  Released under the GNU GPL
 dnl -------------------------------------------------------
 dnl
 
+AC_DEFUN([AC_SAMBA_GNU_MAKE],
+[
+AC_CACHE_CHECK([whether we have GNU make], samba_cv_gnu_make, [
 AC_PATH_PROGS(MAKE,gmake make)
 
-AC_CACHE_CHECK([whether we have GNU make], samba_cv_gnu_make, [
 if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
 then
-       AC_MSG_ERROR([Unable to find GNU make])
+       samba_cv_gnu_make=no
+else
+       samba_cv_gnu_make=yes
 fi
 ])
+if test x$samba_cv_gnu_make = xyes; then
+       $1
+else
+       $2
+fi
+])
+
+AC_SAMBA_GNU_MAKE([AC_MSG_RESULT(found)], [AC_MSG_ERROR([Unable to find GNU make])])
 
 AC_CACHE_CHECK([GNU make version], samba_cv_gnu_make_version,[
                samba_cv_gnu_make_version=`$ac_cv_path_MAKE --version | head -1 | cut -d " " -f 3 2>/dev/null`