[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-434-g3862f31

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  3862f3132549332e0a44fad65d7c49a27e1dbd4a (commit)
      from  82fcd7941f5c54da2d994c8bd99dd8d86299a296 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 3862f3132549332e0a44fad65d7c49a27e1dbd4a
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Sep 3 14:10:35 2008 +0200

    Fix embedding of Samba 4.

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

Summary of changes:
 source/Makefile           |    1 +
 source/build/m4/public.m4 |   12 +++++++++---
 source/lib/zlib.mk        |   27 +++++++++++++--------------
 3 files changed, 23 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile b/source/Makefile
index b0aa009..d91d08a 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -49,6 +49,7 @@ endif
 
 include $(srcdir)/build/make/rules.mk
 include $(srcdir)/build/make/python.mk
+zlibsrcdir := lib/zlib
 dynconfigsrcdir := dynconfig
 heimdalsrcdir := heimdal
 dsdbsrcdir := dsdb
diff --git a/source/build/m4/public.m4 b/source/build/m4/public.m4
index d932f09..d61e00b 100644
--- a/source/build/m4/public.m4
+++ b/source/build/m4/public.m4
@@ -155,16 +155,22 @@ SMB_INFO_ENABLES="$SMB_INFO_ENABLES
 \$enabled{$1} = \"$2\";"
 ])
 
-dnl SMB_WRITE_MAKEVARS(path)
+dnl SMB_WRITE_MAKEVARS(path, skip_vars)
 AC_DEFUN([SMB_WRITE_MAKEVARS],
 [
 echo "configure: creating $1"
 cat >$1<<CEOF
 # $1 - Autogenerated by configure, DO NOT EDIT!
-AC_FOREACH([AC_Var], m4_defn([_AC_SUBST_VARS]), [
-AC_Var = $AC_Var])
 $MAKE_SETTINGS
 CEOF
+skip_vars=" $2 "
+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
+done
 ])
 
 dnl SMB_WRITE_PERLVARS(path)
diff --git a/source/lib/zlib.mk b/source/lib/zlib.mk
index 095f129..5c5e6e6 100644
--- a/source/lib/zlib.mk
+++ b/source/lib/zlib.mk
@@ -1,17 +1,16 @@
 [SUBSYSTEM::ZLIB]
-CFLAGS = -Ilib/zlib
+CFLAGS = -I$(zlibsrcdir)
 
-libzlibsrcdir := lib/zlib
 ZLIB_OBJ_FILES = \
-		$(libzlibsrcdir)/adler32.o \
-		$(libzlibsrcdir)/compress.o \
-		$(libzlibsrcdir)/crc32.o \
-		$(libzlibsrcdir)/gzio.o \
-		$(libzlibsrcdir)/uncompr.o \
-		$(libzlibsrcdir)/deflate.o \
-		$(libzlibsrcdir)/trees.o \
-		$(libzlibsrcdir)/zutil.o \
-		$(libzlibsrcdir)/inflate.o \
-		$(libzlibsrcdir)/infback.o \
-		$(libzlibsrcdir)/inftrees.o \
-		$(libzlibsrcdir)/inffast.o
+		$(zlibsrcdir)/adler32.o \
+		$(zlibsrcdir)/compress.o \
+		$(zlibsrcdir)/crc32.o \
+		$(zlibsrcdir)/gzio.o \
+		$(zlibsrcdir)/uncompr.o \
+		$(zlibsrcdir)/deflate.o \
+		$(zlibsrcdir)/trees.o \
+		$(zlibsrcdir)/zutil.o \
+		$(zlibsrcdir)/inflate.o \
+		$(zlibsrcdir)/infback.o \
+		$(zlibsrcdir)/inftrees.o \
+		$(zlibsrcdir)/inffast.o


-- 
Samba Shared Repository