From a2618d05f91b0ef5cd0216d088025eb4a61d4de5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 3 Sep 2008 14:10:35 +0200
Subject: Fix embedding of Samba 4. (This used to be commit
 3862f3132549332e0a44fad65d7c49a27e1dbd4a)

---
 source4/build/m4/public.m4 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index d932f09a69..d61e00b22e 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -155,16 +155,22 @@ SMB_INFO_ENABLES="$SMB_INFO_ENABLES
 \$enabled{$1} = \"$2\";"
 ])
 
-dnl SMB_WRITE_MAKEVARS(path)
+dnl SMB_WRITE_MAKEVARS(path, skip_vars)
 AC_DEFUN([SMB_WRITE_MAKEVARS],
 [
 echo "configure: creating $1"
 cat >$1<<CEOF
 # $1 - Autogenerated by configure, DO NOT EDIT!
-AC_FOREACH([AC_Var], m4_defn([_AC_SUBST_VARS]), [
-AC_Var = $AC_Var])
 $MAKE_SETTINGS
 CEOF
+skip_vars=" $2 "
+for ac_var in $ac_subst_vars
+do
+    eval ac_val=\$$ac_var
+	if echo "$skip_vars" | grep -v " $ac_var " >/dev/null 2>/dev/null; then
+		echo "$ac_var = $ac_val" >> $1
+	fi
+done
 ])
 
 dnl SMB_WRITE_PERLVARS(path)
-- 
cgit 


From 1a1c30405198d82746851f5244be901cf5d1ae6b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 3 Sep 2008 22:26:02 +0200
Subject: Allow overriding shared library policy using environment variable.
 (This used to be commit d5c61f470d7aa6dd0e5a22e8718d53a69cbbc239)

---
 source4/build/smb_build/main.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index f8a0cb004f..3c84a91a59 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -31,7 +31,9 @@ my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}
 my $subsys_output_type = ["MERGED_OBJ"];
 
 my $library_output_type;
-if ($config::config{USESHARED} eq "true") {
+my $useshared = (defined($ENV{USESHARED})?$ENV{USESHARED}:$config::config{USESHARED});
+
+if ($useshared eq "true") {
 	$library_output_type = ["SHARED_LIBRARY", "MERGED_OBJ"];
 } else {
 	$library_output_type = ["MERGED_OBJ"];
@@ -40,7 +42,7 @@ if ($config::config{USESHARED} eq "true") {
 }
 
 my $module_output_type;
-if ($config::config{USESHARED} eq "true") {
+if ($useshared eq "true") {
 	$module_output_type = ["SHARED_LIBRARY"];
 } else {
 	$module_output_type = ["MERGED_OBJ"];
-- 
cgit