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

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 5a3ae368849d1521c71eb3e75932973fd575e42b..9ef3d71fd03f78c8c5fe1735f7d0b710af3746fd 100644 (file)
--- 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 461b25c6af13397b02c912e58e6a14a559b41ad6..5be4189e064f9af019200fa75b62fc1dd4d58de8 100644 (file)
--- 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