[SCM] Samba Shared Repository - branch master updated - d14244459243ec317438bb0bb06fad0094d1a5e2

[Jelmer Vernooij]

The branch, master has been updated
       via  d14244459243ec317438bb0bb06fad0094d1a5e2 (commit)
       via  d53ff689a39ebd8b6b5dc9a13b9234ab2c8160e5 (commit)
      from  ea4f764322fb3256ca11d0e206f1b39ed3c03c7c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d14244459243ec317438bb0bb06fad0094d1a5e2
Merge: d53ff689a39ebd8b6b5dc9a13b9234ab2c8160e5 ea4f764322fb3256ca11d0e206f1b39ed3c03c7c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Oct 21 16:58:35 2008 +0200

    Merge branch 'master' of git://git.samba.org/samba

commit d53ff689a39ebd8b6b5dc9a13b9234ab2c8160e5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Oct 21 16:45:09 2008 +0200

    Silence undefined variable warnings.

-----------------------------------------------------------------------

Summary of changes:
 source3/samba4.m4 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 05d6552..ed49347 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -129,8 +129,12 @@ SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT
 		 
 oldbuilddir="$builddir"
 builddir="$builddir/../source4"
+oldsrcdir="$srcdir"
+srcdir="$srcdir/../source4"
+AC_SUBST(srcdir)
 SMB_WRITE_PERLVARS(../source4/build/smb_build/config.pm)
 builddir="$oldbuilddir"
+srcdir="$oldsrcdir"
 
 echo "configure: creating ../source4/config.mk"
 cat >../source4/config.mk<<CEOF


-- 
Samba Shared Repository