summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/samba4.m41
-rw-r--r--source4/build/m4/public.m44
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 5a3ae36884..9ef3d71fd0 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 461b25c6af..5be4189e06 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