diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-26 16:55:32 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-26 16:55:32 +0100 |
| commit | 8e9c5f8c006d5753b7bda0df16eadbcf802df0c9 (patch) | |
| tree | 16212a798d183e1141aa17dbc1ea55ca3a8596ce | |
| parent | b39611c36bb904774fd4032bf2f8003fbdeb5d34 (diff) | |
| download | samba-8e9c5f8c006d5753b7bda0df16eadbcf802df0c9.tar.gz samba-8e9c5f8c006d5753b7bda0df16eadbcf802df0c9.tar.bz2 samba-8e9c5f8c006d5753b7bda0df16eadbcf802df0c9.zip | |
Don't filter out any variables for config.pm, only for config.mk.
| -rw-r--r-- | source3/samba4.m4 | 1 | ||||
| -rw-r--r-- | source4/build/m4/public.m4 | 4 |
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 |