From a509b93518b17309f401a6fd107c726c7ab7582f Mon Sep 17 00:00:00 2001
From: Matthieu Patou <mat@matws.net>
Date: Sat, 30 Oct 2010 20:47:45 +0400
Subject: build: Remove zlib from the cache if we failed to pass all the tests

This will avoid problems with redefinition of libs tests
---
 lib/zlib/wscript | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib')

diff --git a/lib/zlib/wscript b/lib/zlib/wscript
index bc6de346118..a091de6b5f1 100644
--- a/lib/zlib/wscript
+++ b/lib/zlib/wscript
@@ -15,6 +15,12 @@ def configure(conf):
                     msg='Checking for ZLIB_VERNUM >= 0x1230',
                     define='HAVE_ZLIB')
 
+    # If we don't do this then we will receive an error that lib 'z'
+    # is already declared as a system lib (for the cases where zlibVersion
+    # is defined
+    if not conf.env['HAVE_ZLIB']:
+                conf.LOCAL_CACHE_SET('TARGET_TYPE', 'z', 'EMPTY')
+
 def build(bld):
     if not bld.CONFIG_SET('HAVE_ZLIB'):
         bld.SAMBA_LIBRARY('z',
-- 
cgit