summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-20 15:34:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:53 -0500
commit61ec62fb2757253a509b57b3e7815c1fb6d0a94b (patch)
tree83a91f5ff0d9cb9e1d0c1a530fe942cf9950bc25 /source4/build/smb_build
parent9ef4e90539c6d262a5fbc36bdde2c8355be3aa56 (diff)
downloadsamba-61ec62fb2757253a509b57b3e7815c1fb6d0a94b.tar.gz
samba-61ec62fb2757253a509b57b3e7815c1fb6d0a94b.tar.bz2
samba-61ec62fb2757253a509b57b3e7815c1fb6d0a94b.zip
r14583: Enable automatic dependencies only if GNU make >= 3.81 is present.
(This used to be commit 2b22f1853306625a4c59763ef11965ac8900d4ff)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/env.pm7
-rw-r--r--source4/build/smb_build/makefile.pm1
-rw-r--r--source4/build/smb_build/summary.pm9
3 files changed, 11 insertions, 6 deletions
diff --git a/source4/build/smb_build/env.pm b/source4/build/smb_build/env.pm
index c090fb83eb..70c4d7e968 100644
--- a/source4/build/smb_build/env.pm
+++ b/source4/build/smb_build/env.pm
@@ -47,11 +47,8 @@ sub _set_config($$)
$self->{config}->{exec_prefix} = $self->{config}->{prefix};
}
- if ($self->{config}->{developer} eq "yes") {
- $self->{developer} = 1;
- } else {
- $self->{developer} = 0;
- }
+ $self->{developer} = ($self->{config}->{developer} eq "yes");
+ $self->{automatic_deps} = ($self->{config}->{automatic_dependencies} eq "yes");
}
sub PkgConfig($$$$$$$$)
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index a7dc4ff3e5..a6d6d2b741 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -18,7 +18,6 @@ sub new($$$)
bless($self, $myname);
- $self->{automatic_deps} = 0;
$self->{manpages} = [];
$self->{sbin_progs} = [];
$self->{bin_progs} = [];
diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm
index 95a342e2f9..b9ba1e96be 100644
--- a/source4/build/smb_build/summary.pm
+++ b/source4/build/smb_build/summary.pm
@@ -41,6 +41,15 @@ sub show($$)
showitem($output, "using libblkid", ["BLKID"]);
showitem($output, "using pam", ["PAM"]);
print "Using external popt: ".lc($output->{EXT_LIB_POPT}->{ENABLE})."\n";
+ print "Developer mode: ".lc($config->{developer})."\n";
+ print "Automatic dependencies: ";
+
+ if ($config->{automatic_dependencies} eq "yes") {
+ print "yes\n";
+ } else {
+ print "no (install GNU make >= 3.81)\n";
+ }
+
print "Using shared libraries internally (experimental): ";
if ($config->{BLDSHARED} eq "true") {