r18749: Disable automatic dependencies by default (use --enable-automatic-dependencie...

(This used to be commit 5506c404877434c403bbe3055c6dd6c32531c96d)

diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4
index e49d89a521c368026b5b2e6a8b54cab826be3ccc..faae1791881b66ec8c0096fcf0e19c5e6585a585 100644 (file)
--- a/source4/build/m4/check_make.m4
+++ b/source4/build/m4/check_make.m4
@@ -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 @@ 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)

diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm
index 83b6ed07571ffac34b48b42c37e55b7bb85e949b..94da12fc91369d2fd7636316abdf0d0601dcc502 100644 (file)
--- a/source4/build/smb_build/summary.pm
+++ b/source4/build/smb_build/summary.pm
@@ -53,7 +53,7 @@ sub show($$)
        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: " .