summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-11-23 01:59:30 +0100
committerMichael Adam <obnox@samba.org>2008-11-23 02:02:26 +0100
commit09bc3a2f9c3847aafdb2e6cc2651baba62f2489e (patch)
tree70fbb3bf7de134f5391e0074d92c5618127b07e5
parent71c782c72af496c86491d16ef384a5b320f9616f (diff)
downloadsamba-09bc3a2f9c3847aafdb2e6cc2651baba62f2489e.tar.gz
samba-09bc3a2f9c3847aafdb2e6cc2651baba62f2489e.tar.bz2
samba-09bc3a2f9c3847aafdb2e6cc2651baba62f2489e.zip
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
-rw-r--r--source3/configure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 287189f093..9214d031b3 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