svn commit: samba r15224 - in branches/SAMBA_4_0/source: build/m4 include lib/replace

jelmer at samba.org jelmer at samba.org
Mon Apr 24 22:50:20 GMT 2006


Author: jelmer
Date: 2006-04-24 22:50:19 +0000 (Mon, 24 Apr 2006)
New Revision: 15224

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15224

Log:
Check whether -MT is actually supported by the compiler before using 
automatic dependencies

Modified:
   branches/SAMBA_4_0/source/build/m4/check_cc.m4
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-04-24 20:45:32 UTC (rev 15223)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-04-24 22:50:19 UTC (rev 15224)
@@ -216,11 +216,12 @@
 	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)

Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2006-04-24 20:45:32 UTC (rev 15223)
+++ branches/SAMBA_4_0/source/include/includes.h	2006-04-24 22:50:19 UTC (rev 15224)
@@ -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

Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h	2006-04-24 20:45:32 UTC (rev 15223)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h	2006-04-24 22:50:19 UTC (rev 15224)
@@ -109,7 +109,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



More information about the samba-cvs mailing list