From: Michael Adam <obnox@samba.org>
Date: Sun, 23 Nov 2008 00:59:30 +0000 (+0100)
Subject: s3 build: when detecting to use internal zlib, put "-I../lib/zlib" first in CFLAGS
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=09bc3a2f9c3847aafdb2e6cc2651baba62f2489e;ds=sidebyside

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
---

diff --git a/source3/configure.in b/source3/configure.in
index 287189f0938..9214d031b3d 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