Fix embedding of Samba 4.

(This used to be commit 3862f3132549332e0a44fad65d7c49a27e1dbd4a)

diff --git a/source4/Makefile b/source4/Makefile
index b0aa009edd2bede4671859f58987c925354e1003..d91d08a252b04eb40e4d2ad91827a8ec326d4bd6 100644 (file)
--- a/source4/Makefile
+++ b/source4/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/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index d932f09a694e71a404b4dcfbf0f824837da24edf..d61e00b22ef926587374466e41a8b5aa7f3fadf7 100644 (file)
--- a/source4/build/m4/public.m4
+++ b/source4/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/source4/lib/zlib.mk b/source4/lib/zlib.mk
index 095f129feb24cc66dbbe2402256dae6e70711a14..5c5e6e69ba6e3211d3e6185d7f96b8f7c7aabe3a 100644 (file)
--- a/source4/lib/zlib.mk
+++ b/source4/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