[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-317-gce9d759

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  ce9d759497ea49e54e9d96422ad07368e2925872 (commit)
       via  9d1d2abed19c3b8378a78d4b81503b427d401ab5 (commit)
      from  fbfbc1f163520b3b9a4a3bf8bdddf26749cc7255 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit ce9d759497ea49e54e9d96422ad07368e2925872
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat May 10 21:29:09 2008 +0200

    Fix building with system-provided LDB without breaking anything else :-)

commit 9d1d2abed19c3b8378a78d4b81503b427d401ab5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat May 10 20:59:48 2008 +0200

    Revert "Fix building with system-provided LDB."
    
    This reverts commit fbfbc1f163520b3b9a4a3bf8bdddf26749cc7255.

-----------------------------------------------------------------------

Summary of changes:
 source/build/m4/public.m4       |    3 ---
 source/build/smb_build/input.pm |   34 +++++++++++++++-------------------
 2 files changed, 15 insertions(+), 22 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/m4/public.m4 b/source/build/m4/public.m4
index 2896098..1eae998 100644
--- a/source/build/m4/public.m4
+++ b/source/build/m4/public.m4
@@ -139,9 +139,6 @@ $1_CPPFLAGS = $4
 $1_LDFLAGS = $5
 "
 
-SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
-@<:@EXT_LIB::$1@:>@
-"
 ])
 
 dnl SMB_ENABLE(name,default_build)
diff --git a/source/build/smb_build/input.pm b/source/build/smb_build/input.pm
index 3ca2f22..34b4445 100644
--- a/source/build/smb_build/input.pm
+++ b/source/build/smb_build/input.pm
@@ -94,10 +94,8 @@ sub check_module($$$)
 	unless (defined($mod->{INIT_FUNCTION_SENTINEL})) { $mod->{INIT_FUNCTION_SENTINEL} = "NULL"; }
 
 	if (not defined($mod->{OUTPUT_TYPE})) {
-		if (not defined($INPUT->{$mod->{SUBSYSTEM}}->{TYPE})) {
-			die("Invalid type for subsystem $mod->{SUBSYSTEM}");
-		}
-		if ($INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "EXT_LIB") {
+		if ((not defined($INPUT->{$mod->{SUBSYSTEM}}->{TYPE})) or 
+			$INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "EXT_LIB") {
 			$mod->{OUTPUT_TYPE} = undef;
 		} else {
 			$mod->{OUTPUT_TYPE} = $default_ot;
@@ -181,15 +179,13 @@ sub add_implicit($$)
 {
 	my ($INPUT, $n) = @_;
 
-	$INPUT->{$n} = {
-		TYPE => "MAKE_RULE",
-		NAME => $n,
-		OUTPUT_TYPE => undef,
-		LIBS => ["\$(".uc($n)."_LIBS)"],
-		LDFLAGS => ["\$(".uc($n)."_LDFLAGS)"],
-		CFLAGS => ["\$(".uc($n)."_CFLAGS)"],
-		CPPFLAGS => ["\$(".uc($n)."_CPPFLAGS)"]
-	};
+	$INPUT->{$n}->{TYPE} = "MAKE_RULE";
+	$INPUT->{$n}->{NAME} = $n;
+	$INPUT->{$n}->{OUTPUT_TYPE} = undef;
+	$INPUT->{$n}->{LIBS} = ["\$(".uc($n)."_LIBS)"];
+	$INPUT->{$n}->{LDFLAGS} = ["\$(".uc($n)."_LDFLAGS)"];
+	$INPUT->{$n}->{CFLAGS} = ["\$(".uc($n)."_CFLAGS)"];
+	$INPUT->{$n}->{CPPFLAGS} = ["\$(".uc($n)."_CPPFLAGS)"];
 }
 
 sub calc_unique_deps($$$$$$$$)
@@ -198,7 +194,7 @@ sub calc_unique_deps($$$$$$$$)
 	my ($name, $INPUT, $deps, $udeps, $withlibs, $forward, $pubonly, $busy) = @_;
 
 	foreach my $n (@$deps) {
-		add_implicit($INPUT, $n) unless (defined($INPUT->{$n}));
+		add_implicit($INPUT, $n) unless (defined($INPUT->{$n}) and defined($INPUT->{$n}->{TYPE}));
 		my $dep = $INPUT->{$n};
 		if (grep (/^$n$/, @$busy)) {
 			next if (@{$dep->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ");
@@ -206,19 +202,19 @@ sub calc_unique_deps($$$$$$$$)
 		}
 		next if (grep /^$n$/, @$udeps);
 
-		push (@{$udeps}, $dep->{NAME}) if $forward;
+		push (@{$udeps}, $n) if $forward;
 
  		if (defined ($dep->{OUTPUT_TYPE}) && 
 			($withlibs or 
 			(@{$dep->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ") or 
 			(@{$dep->{OUTPUT_TYPE}}[0] eq "STATIC_LIBRARY"))) {
-				push (@$busy, $dep->{NAME});
-			        calc_unique_deps($dep->{NAME}, $INPUT, $dep->{PUBLIC_DEPENDENCIES}, $udeps, $withlibs, $forward, $pubonly, $busy);
-			        calc_unique_deps($dep->{NAME}, $INPUT, $dep->{PRIVATE_DEPENDENCIES}, $udeps, $withlibs, $forward, $pubonly, $busy) unless $pubonly;
+				push (@$busy, $n);
+			        calc_unique_deps($n, $INPUT, $dep->{PUBLIC_DEPENDENCIES}, $udeps, $withlibs, $forward, $pubonly, $busy);
+			        calc_unique_deps($n, $INPUT, $dep->{PRIVATE_DEPENDENCIES}, $udeps, $withlibs, $forward, $pubonly, $busy) unless $pubonly;
 				pop (@$busy);
 	        }
 
-		unshift (@{$udeps}, $dep->{NAME}) unless $forward;
+		unshift (@{$udeps}, $n) unless $forward;
 	}
 }
 


-- 
Samba Shared Repository