From c5792dbbb5998368d18330add4143ca44e24e203 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Wed, 5 Apr 2006 23:54:12 +0000
Subject: r14930: Coalesce the "feature enabled" tests so that the config
 summary always emits a yes or a no. (This used to be commit
 c31e233a09c34fceee99193ef6f39ff3fabd543e)

---
 source4/build/smb_build/summary.pm | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm
index b9ba1e96be..b0dfbb5a16 100644
--- a/source4/build/smb_build/summary.pm
+++ b/source4/build/smb_build/summary.pm
@@ -7,6 +7,13 @@
 package summary;
 use strict;
 
+sub enabled($)
+{
+    my ($val) = @_;
+
+    return (defined($val) && $val =~ m/yes|true/i);
+}
+
 sub showitem($$$)
 {
 	my ($output,$desc,$items) = @_;
@@ -14,7 +21,7 @@ sub showitem($$$)
 	my @need = ();
 
 	foreach (@$items) {
-		if ($output->{"EXT_LIB_$_"}->{ENABLE} ne "YES") {
+		if (!enabled($output->{"EXT_LIB_$_"}->{ENABLE})) {
 			push (@need, $_);
 		}
 	}
@@ -40,24 +47,19 @@ sub show($$)
 	showitem($output, "using extended attributes", ["XATTR"]);
 	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 external popt: ".
+	    (enabled($output->{EXT_LIB_POPT}->{ENABLE})?"yes":"no")."\n";
+	print "Developer mode: ".(enabled($config->{developer})?"yes":"no")."\n";
+	print "Automatic dependencies: ".
+	    (enabled($config->{automatic_dependencies})
+		    ? "yes" : "no (install GNU make >= 3.81)") .
+	     "\n";
 	
-	print "Using shared libraries internally (experimental): ";
-
-	if ($config->{BLDSHARED} eq "true") {
-		print "yes\n";
-	} else {
-		print "no (try --enable-dso)\n";
+	print "Using shared libraries internally (experimental): " .
+	    (enabled($config->{BLDSHARED})
+		    ? "yes" : "no (try --enable-dso)") .
+	    "\n";
 
-	}
 	print "\n";
 }
 
-- 
cgit