From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 26 Nov 2008 15:55:32 +0000 (+0100)
Subject: Don't filter out any variables for config.pm, only for config.mk.
X-Git-Tag: samba-4.0.0alpha6~480^2~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e9c5f8c006d5753b7bda0df16eadbcf802df0c9;p=thirdparty%2Fsamba.git

Don't filter out any variables for config.pm, only for config.mk.
---

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 5a3ae368849..9ef3d71fd03 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -131,6 +131,7 @@ builddir="$builddir/../source4"
 oldsrcdir="$srcdir"
 srcdir="$srcdir/../source4"
 AC_SUBST(srcdir)
+AC_SUBST(builddir)
 SMB_WRITE_PERLVARS(../source4/build/smb_build/config.pm)
 builddir="$oldbuilddir"
 srcdir="$oldsrcdir"
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 461b25c6af1..5be4189e064 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -194,9 +194,7 @@ CEOF
 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
+	echo "$ac_var => '$ac_val'," >> $1
 done
 
 cat >>$1<<CEOF