From ed6d3fd7ab827f48c8e5949805644bb34b1ad5f2 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 14 Oct 2008 22:26:54 +0200 Subject: Move checks for make inside function. --- source4/build/m4/check_make.m4 | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'source4/build/m4/check_make.m4') 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` -- cgit From 79f1ba875471f797218a0fbc76cbf06b0a862cf8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 14 Oct 2008 22:37:10 +0200 Subject: Make check_*.m4 m4 library files just contain functions that can be executed from other m4 files. --- source4/build/m4/check_make.m4 | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'source4/build/m4/check_make.m4') diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4 index a7609693fe..50cabfdf3c 100644 --- a/source4/build/m4/check_make.m4 +++ b/source4/build/m4/check_make.m4 @@ -25,27 +25,9 @@ else fi ]) -AC_SAMBA_GNU_MAKE([AC_MSG_RESULT(found)], [AC_MSG_ERROR([Unable to find GNU make])]) - +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) +]) -- cgit From 6e2a470cd281cf39555d6401455be2f3bdca23ec Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 14 Oct 2008 22:40:21 +0200 Subject: Move make check out of cache call to avoid weird formatting. --- source4/build/m4/check_make.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/m4/check_make.m4') diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4 index 50cabfdf3c..343913f884 100644 --- a/source4/build/m4/check_make.m4 +++ b/source4/build/m4/check_make.m4 @@ -8,9 +8,9 @@ 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 samba_cv_gnu_make=no -- cgit