diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-09-20 23:19:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:19:06 -0500 |
| commit | 8524a6f5c925c7573d28e2fecd0f5bae58fbc1ff (patch) | |
| tree | 1a7d01009da57f20e0e4212dba9b28625b6b956e | |
| parent | 4de1fbfde81355b54c0fbac7749da9cc10b965b0 (diff) | |
| download | samba-8524a6f5c925c7573d28e2fecd0f5bae58fbc1ff.tar.gz samba-8524a6f5c925c7573d28e2fecd0f5bae58fbc1ff.tar.xz samba-8524a6f5c925c7573d28e2fecd0f5bae58fbc1ff.zip | |
r18749: Disable automatic dependencies by default (use --enable-automatic-dependencies to reenable).
(This used to be commit 5506c404877434c403bbe3055c6dd6c32531c96d)
| -rw-r--r-- | source4/build/m4/check_make.m4 | 5 | ||||
| -rw-r--r-- | source4/build/smb_build/summary.pm | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4 index e49d89a521c..faae1791881 100644 --- 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 83b6ed07571..94da12fc913 100644 --- 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: " . |