Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 18 insertions, 9 deletions

diff --git a/source4/script/find_unused_makefilevars.pl b/source4/script/find_unused_makefilevars.pl
index 1bed1228ec..23fc36ef6a 100755
--- a/source4/script/find_unused_makefilevars.pl
+++ b/source4/script/find_unused_makefilevars.pl
@@ -13,17 +13,26 @@ my %defines;
 # First, make a list of defines in configure
 $in = shift;
 
-open(IN, $in);
-while(<IN>) {
-	my $line = $_;
-	while($line =~ /^\b([a-zA-Z0-9_][a-zA-Z0-9_]*)\b[ \t]*=.*/sgm) {
-		$defines{$1} = 1;
-	}
-	while($line =~ /\$\(([a-zA-Z0-9_][a-zA-Z0-9_]*)\)/sgm) {
-		$references{$1} = 1;
+sub process_file($)
+{
+	my ($fn) = @_;
+	open(IN, $fn);
+	while(<IN>) {
+		my $line = $_;
+		while($line =~ /^\b([a-zA-Z0-9_][a-zA-Z0-9_]*)\b[ \t]*=.*/sgm) {
+			$defines{$1} = 1;
+		}
+		while($line =~ /\$\(([a-zA-Z0-9_][a-zA-Z0-9_]*)\)/sgm) {
+			$references{$1} = 1;
+		}
+		while ($line =~ /^include (.*)/sgm) {
+			process_file($1);
+		}
 	}
+	close IN;
 }
-close IN;
+
+process_file($in);
 
 print "##### DEFINED BUT UNUSED: #####\n";
 foreach(%defines) {