diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-24 22:50:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:04:20 -0500 |
| commit | 847e80dee9c405f021c67d5ffb09804751ea2be7 (patch) | |
| tree | d51279f69a90b4883893195d0a092d5bffc085b6 /source4 | |
| parent | 82f19553144f13e88ea58d04da15aba94059505f (diff) | |
| download | samba-847e80dee9c405f021c67d5ffb09804751ea2be7.tar.gz samba-847e80dee9c405f021c67d5ffb09804751ea2be7.tar.bz2 samba-847e80dee9c405f021c67d5ffb09804751ea2be7.zip | |
r15224: Check whether -MT is actually supported by the compiler before using
automatic dependencies
(This used to be commit 6598efc6b302984d0b26b0c76a4b7107f5feba21)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/m4/check_cc.m4 | 3 | ||||
| -rw-r--r-- | source4/include/includes.h | 2 | ||||
| -rw-r--r-- | source4/lib/replace/replace.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4 index 99e6bd5d23..6823237805 100644 --- a/source4/build/m4/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 @@ -216,11 +216,12 @@ if test "x$GNU_MAKE" = x"yes"; then AC_SUBST(GNU_MAKE_VERSION) fi + automatic_dependencies=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 - automatic_dependencies=yes + AX_CXXFLAGS_GCC_OPTION(-MT, [], [automatic_dependencies=yes], []) fi fi AC_MSG_RESULT($automatic_dependencies) diff --git a/source4/include/includes.h b/source4/include/includes.h index 77f0b02010..6252a59c2f 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -45,7 +45,7 @@ #endif #ifndef PRINTF_ATTRIBUTE -#if !defined(NO_PRINTF_ATTRIBUTE) && (__GNUC__ >= 3) +#if __GNUC__ >= 3 /** Use gcc attribute to check printf fns. a1 is the 1-based index of * the parameter containing the format, and a2 the index of the first * argument. Note that some gcc 2.x versions don't handle this diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h index bc1be38de0..9be365d4da 100644 --- a/source4/lib/replace/replace.h +++ b/source4/lib/replace/replace.h @@ -109,7 +109,7 @@ int vasprintf(char **ptr, const char *format, va_list ap); #endif #ifndef PRINTF_ATTRIBUTE -#if !defined(NO_PRINTF_ATTRIBUTE) && (__GNUC__ >= 3) +#if __GNUC__ >= 3 /** Use gcc attribute to check printf fns. a1 is the 1-based index of * the parameter containing the format, and a2 the index of the first * argument. Note that some gcc 2.x versions don't handle this |