[SCM] Samba Shared Repository - branch master updated -
8e9c5f8c006d5753b7bda0df16eadbcf802df0c9
Jelmer Vernooij
jelmer at samba.org
Wed Nov 26 15:55:57 GMT 2008
The branch, master has been updated
via 8e9c5f8c006d5753b7bda0df16eadbcf802df0c9 (commit)
from b39611c36bb904774fd4032bf2f8003fbdeb5d34 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8e9c5f8c006d5753b7bda0df16eadbcf802df0c9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Nov 26 16:55:32 2008 +0100
Don't filter out any variables for config.pm, only for config.mk.
-----------------------------------------------------------------------
Summary of changes:
source3/samba4.m4 | 1 +
source4/build/m4/public.m4 | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 5a3ae36..9ef3d71 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 461b25c..5be4189 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
--
Samba Shared Repository
More information about the samba-cvs
mailing list