The branch, master has been updated
via 09bc3a2f9c3847aafdb2e6cc2651baba62f2489e (commit)
from 71c782c72af496c86491d16ef384a5b320f9616f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 09bc3a2f9c3847aafdb2e6cc2651baba62f2489e
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sun Nov 23 01:59:30 2008 +0100
s3 build: when detecting to use internal zlib, put "-I../lib/zlib" first in
CFLAGS
This should fix a build error on our Tru64 build farm box where a zlib.h is
found in an include path handed in via external CFLAGS, but that zlib.h
belongs
to an old zlib. So in ndr_compression.c, "#include <zlib.h>" includes the
wrong
header for the internal zlib.
Michael
-----------------------------------------------------------------------
Summary of changes:
source3/configure.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index 287189f..9214d03 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6256,7 +6256,7 @@ AC_ZLIB([ZLIB_OBJS=""], [
do
ZLIB_OBJS="$ZLIB_OBJS ../lib/zlib/$o"
done
- CFLAGS="$CFLAGS -I../lib/zlib"
+ CFLAGS="-I../lib/zlib $CFLAGS"
])
dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
--
Samba Shared Repository
