diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-14 06:22:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:39 -0500 |
| commit | a4e94eedf04524d5271344a492a41da951c535c2 (patch) | |
| tree | 3099c11671f4c657733e95dc1aebcc02a01d4c9b /source4 | |
| parent | ac24d381a5a9bc4611701bcbf956fe017bdddaeb (diff) | |
| download | samba-a4e94eedf04524d5271344a492a41da951c535c2.tar.gz samba-a4e94eedf04524d5271344a492a41da951c535c2.tar.bz2 samba-a4e94eedf04524d5271344a492a41da951c535c2.zip | |
r18500: move make related checks into its own file
metze
(This used to be commit 6a6729fb7219ac7eb160b787827acdf1f7af7cc8)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/m4/check_cc.m4 | 37 | ||||
| -rw-r--r-- | source4/build/m4/check_make.m4 | 43 | ||||
| -rw-r--r-- | source4/build/m4/env.m4 | 1 |
3 files changed, 44 insertions, 37 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4 index d8dd407891..62b8e48e7a 100644 --- a/source4/build/m4/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 @@ -203,40 +203,3 @@ fi AC_SUBST(HOSTCC) AC_PATH_PROG(GCOV,gcov) - -AC_PATH_PROG(MAKE,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=yes -else - samba_cv_gnu_make=no -fi -]) - -GNU_MAKE=$samba_cv_gnu_make -AC_SUBST(GNU_MAKE) - -if test "x$GNU_MAKE" = x"yes"; then - 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) -fi - - -new_make=no -AC_MSG_CHECKING([for GNU make >= 3.81]) -if test x$GNU_MAKE = x"yes"; then - if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then - new_make=yes - fi -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_MSG_RESULT($automatic_dependencies) -AC_SUBST(automatic_dependencies) diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4 new file mode 100644 index 0000000000..e49d89a521 --- /dev/null +++ b/source4/build/m4/check_make.m4 @@ -0,0 +1,43 @@ +dnl SMB Build Environment make Checks +dnl ------------------------------------------------------- +dnl Copyright (C) Stefan (metze) Metzmacher 2004 +dnl Released under the GNU GPL +dnl ------------------------------------------------------- +dnl + +AC_PATH_PROG(MAKE,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=yes +else + samba_cv_gnu_make=no +fi +]) + +GNU_MAKE=$samba_cv_gnu_make +AC_SUBST(GNU_MAKE) + +if test "x$GNU_MAKE" = x"yes"; then + 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) +fi + + +new_make=no +AC_MSG_CHECKING([for GNU make >= 3.81]) +if test x$GNU_MAKE = x"yes"; then + if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then + new_make=yes + fi +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_MSG_RESULT($automatic_dependencies) +AC_SUBST(automatic_dependencies) diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4 index 6428a0b265..f7f812ae24 100644 --- a/source4/build/m4/env.m4 +++ b/source4/build/m4/env.m4 @@ -37,5 +37,6 @@ m4_include(build/m4/check_path.m4) m4_include(build/m4/check_perl.m4) m4_include(build/m4/check_cc.m4) m4_include(build/m4/check_ld.m4) +m4_include(build/m4/check_make.m4) m4_include(build/m4/check_types.m4) m4_include(build/m4/check_doc.m4) |