diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-14 22:26:54 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-14 22:26:54 +0200 |
| commit | ed6d3fd7ab827f48c8e5949805644bb34b1ad5f2 (patch) | |
| tree | cf5020c1aa903a4c95efcb907354aeed52d3a131 | |
| parent | 436346e3adff8804bd9e49bfa7ec4ace8eb4e12a (diff) | |
| download | samba-ed6d3fd7ab827f48c8e5949805644bb34b1ad5f2.tar.gz samba-ed6d3fd7ab827f48c8e5949805644bb34b1ad5f2.tar.bz2 samba-ed6d3fd7ab827f48c8e5949805644bb34b1ad5f2.zip | |
Move checks for make inside function.
| -rw-r--r-- | source4/build/m4/check_make.m4 | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4 index f497684453..a7609693fe 100644 --- 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` |