diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-15 00:15:34 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-15 00:15:34 +0200 |
commit | 75dabe874c0cf8893dd61f547d0c3878d411a433 (patch) | |
tree | 345db786efab8ad51a7a2181610c1cc22693fe34 /source4/build/m4/check_make.m4 | |
parent | 91437ea7bc6f74729ec40b5b1eeea57287dd85c4 (diff) | |
parent | ecca199486a30957e7f0dc084d0e21eb3c812c15 (diff) | |
download | samba-75dabe874c0cf8893dd61f547d0c3878d411a433.tar.gz samba-75dabe874c0cf8893dd61f547d0c3878d411a433.tar.bz2 samba-75dabe874c0cf8893dd61f547d0c3878d411a433.zip |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source4/build/m4/check_make.m4')
-rw-r--r-- | source4/build/m4/check_make.m4 | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4 index f497684453..343913f884 100644 --- a/source4/build/m4/check_make.m4 +++ b/source4/build/m4/check_make.m4 @@ -6,34 +6,28 @@ dnl Released under the GNU GPL dnl ------------------------------------------------------- dnl +AC_DEFUN([AC_SAMBA_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_DEFUN([AC_SAMBA_GNU_MAKE_VERSION], +[ 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` ]) - GNU_MAKE_VERSION=$samba_cv_gnu_make_version - AC_SUBST(GNU_MAKE_VERSION) - - -new_make=no -AC_MSG_CHECKING([for GNU make >= 3.81]) -if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then - new_make=yes -fi -AC_MSG_RESULT($new_make) -automatic_dependencies=no -AX_CFLAGS_GCC_OPTION([-M -MT conftest.d -MF conftest.o], [], [ automatic_dependencies=$new_make ], []) -AC_MSG_CHECKING([Whether to use automatic dependencies]) -AC_ARG_ENABLE(automatic-dependencies, -[ --enable-automatic-dependencies Enable automatic dependencies], -[ automatic_dependencies=$enableval ], -[ automatic_dependencies=no ]) -AC_MSG_RESULT($automatic_dependencies) -AC_SUBST(automatic_dependencies) +]) |