summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/build/smb_build/TODO1
-rw-r--r--source4/build/smb_build/header.pm1
-rw-r--r--source4/build/smb_build/input.pm21
-rw-r--r--source4/build/smb_build/main.pl3
-rw-r--r--source4/build/smb_build/summary.pm51
5 files changed, 60 insertions, 17 deletions
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index c905e2fbb6..cb92772cf1 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,3 +1,4 @@
+- subdir handler for install headers into a specific directory
- sonames
- hack for loading modules locally
- create
diff --git a/source4/build/smb_build/header.pm b/source4/build/smb_build/header.pm
index a34bcb9025..1a57ee4364 100644
--- a/source4/build/smb_build/header.pm
+++ b/source4/build/smb_build/header.pm
@@ -2,6 +2,7 @@
# - create output for build.h
#
# Copyright (C) Stefan (metze) Metzmacher 2004
+# Copyright (C) Jelmer Vernooij 2005
# Released under the GNU GPL
package header;
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index fd887094aa..c0139cb7df 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -33,10 +33,7 @@ sub str2array($)
sub check_subsystem($$$)
{
my ($INPUT, $subsys, $default_ot) = @_;
- if ($subsys->{ENABLE} ne "YES") {
- printf("Subsystem `%s' disabled\n",$subsys->{NAME});
- return;
- }
+ return if ($subsys->{ENABLE} ne "YES");
unless(defined($subsys->{OUTPUT_TYPE})) {
$subsys->{OUTPUT_TYPE} = $default_ot;
@@ -60,11 +57,7 @@ sub check_module($$$)
return;
}
- if ($mod->{ENABLE} ne "YES")
- {
- printf("Module `%s' disabled\n",$mod->{NAME});
- return;
- }
+ return if ($mod->{ENABLE} ne "YES");
if (exists($INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTION_TYPE})) {
$mod->{INIT_FUNCTION_TYPE} = $INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTION_TYPE};
@@ -91,10 +84,7 @@ sub check_library($$$)
{
my ($INPUT, $lib, $default_ot) = @_;
- if ($lib->{ENABLE} ne "YES") {
- printf("Library `%s' disabled\n",$lib->{NAME});
- return;
- }
+ return if ($lib->{ENABLE} ne "YES");
$lib->{OUTPUT_TYPE} = $default_ot;
@@ -114,10 +104,7 @@ sub check_binary($$)
{
my ($INPUT, $bin) = @_;
- if ($bin->{ENABLE} ne "YES") {
- printf("Binary `%s' disabled\n",$bin->{NAME});
- return;
- }
+ return if ($bin->{ENABLE} ne "YES");
($bin->{BINARY} = (lc $bin->{NAME})) if not defined($bin->{BINARY});
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 747118db33..130dd188c6 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -12,6 +12,7 @@ use smb_build::config_mk;
use smb_build::output;
use smb_build::env;
use smb_build::cflags;
+use smb_build::summary;
use config;
use strict;
@@ -81,4 +82,6 @@ header::create_smb_build_h($OUTPUT, "include/build.h");
cflags::create_cflags($OUTPUT, "extra_cflags.txt");
+summary::show($OUTPUT, \%config::config);
+
1;
diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm
new file mode 100644
index 0000000000..c3edb094f3
--- /dev/null
+++ b/source4/build/smb_build/summary.pm
@@ -0,0 +1,51 @@
+# Samba Build System
+# - write out summary
+#
+# Copyright (C) Jelmer Vernooij 2006
+# Released under the GNU GPL
+
+package summary;
+use strict;
+
+sub showitem($$$)
+{
+ my ($output,$desc,$items) = @_;
+
+ my @need = ();
+
+ foreach (@$items) {
+ if ($output->{"EXT_LIB_$_"}->{ENABLE} ne "YES") {
+ push (@need, $_);
+ }
+ }
+
+ print "Support for $desc: ";
+ if ($#need > 0) {
+ print "no (install " . join(',',@need) . ")\n";
+ } else {
+ print "yes\n";
+ }
+}
+
+sub show($$)
+{
+ my ($output,$config) = @_;
+ print "Summary:\n\n";
+ showitem($output, "GTK+ frontends", ["gtk","gconf"]);
+ showitem($output, "SSL in SWAT", ["GNUTLS"]);
+ showitem($output, "threads in smbd", ["PTHREAD"]);
+ showitem($output, "intelligent command line editing", ["READLINE"]);
+ showitem($output, "changing process titles", ["SETPROCTITLE"]);
+ print "Using external popt: $output->{EXT_LIB_POPT}->{ENABLE}\n";
+ print "Using shared libraries internally (experimental): ";
+
+ if ($config->{BLDSHARED} eq "true") {
+ print "yes\n";
+ } else {
+ print "no (try --enable-dso)\n";
+
+ }
+ print "\n";
+}
+
+1;