diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-03 14:10:35 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-03 14:10:35 +0200 |
| commit | a2618d05f91b0ef5cd0216d088025eb4a61d4de5 (patch) | |
| tree | c9ef1310e7ad54b5edaa9229c2f1c50e99dfe37a | |
| parent | a35263e1ab81cac7855158012157769e3e9000f7 (diff) | |
| download | samba-a2618d05f91b0ef5cd0216d088025eb4a61d4de5.tar.gz samba-a2618d05f91b0ef5cd0216d088025eb4a61d4de5.tar.bz2 samba-a2618d05f91b0ef5cd0216d088025eb4a61d4de5.zip | |
Fix embedding of Samba 4.
(This used to be commit 3862f3132549332e0a44fad65d7c49a27e1dbd4a)
| -rw-r--r-- | source4/Makefile | 1 | ||||
| -rw-r--r-- | source4/build/m4/public.m4 | 12 | ||||
| -rw-r--r-- | source4/lib/zlib.mk | 27 |
3 files changed, 23 insertions, 17 deletions
diff --git a/source4/Makefile b/source4/Makefile index b0aa009edd..d91d08a252 100644 --- 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 d932f09a69..d61e00b22e 100644 --- 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 095f129feb..5c5e6e69ba 100644 --- 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 |