svn commit: samba r18749 - in branches/SAMBA_4_0/source/build: m4 smb_build

[jelmer at samba.org]

Author: jelmer
Date: 2006-09-20 23:19:37 +0000 (Wed, 20 Sep 2006)
New Revision: 18749

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

Log:
Disable automatic dependencies by default (use --enable-automatic-dependencies to reenable). 

Modified:
   branches/SAMBA_4_0/source/build/m4/check_make.m4
   branches/SAMBA_4_0/source/build/smb_build/summary.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_make.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_make.m4	2006-09-20 22:55:44 UTC (rev 18748)
+++ branches/SAMBA_4_0/source/build/m4/check_make.m4	2006-09-20 23:19:37 UTC (rev 18749)
@@ -1,6 +1,7 @@
 dnl SMB Build Environment make Checks
 dnl -------------------------------------------------------
 dnl  Copyright (C) Stefan (metze) Metzmacher 2004
+dnl  Copyright (C) Jelmer Vernooij 2005
 dnl  Released under the GNU GPL
 dnl -------------------------------------------------------
 dnl
@@ -39,5 +40,9 @@
 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)

Modified: branches/SAMBA_4_0/source/build/smb_build/summary.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/summary.pm	2006-09-20 22:55:44 UTC (rev 18748)
+++ branches/SAMBA_4_0/source/build/smb_build/summary.pm	2006-09-20 23:19:37 UTC (rev 18749)
@@ -53,7 +53,7 @@
 	print "Developer mode: ".(enabled($config->{developer})?"yes":"no")."\n";
 	print "Automatic dependencies: ".
 	    (enabled($config->{automatic_dependencies})
-		    ? "yes" : "no (install GNU make >= 3.81)") .
+		    ? "yes" : "no (install GNU make >= 3.81 and see --enable-automatic-dependencies)") .
 	     "\n";
 	
 	print "Using shared libraries: " .