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

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"

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