# HG changeset patch
# User bjarni
# Date 1143799458 0
# Node ID 56f72f7838cc270416d5d7f5fba1e8f0d2109f86
# Parent  e94795a55f13f6caf24d3a2d2d6461ad41bafb53
(svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all

diff -r e94795a55f13 -r 56f72f7838cc Makefile
--- a/Makefile	Fri Mar 31 09:09:26 2006 +0000
+++ b/Makefile	Fri Mar 31 10:04:18 2006 +0000
@@ -416,8 +416,17 @@
 
 # zlib config
 ifdef WITH_ZLIB
-	CDEFS +=  -DWITH_ZLIB
-	LIBS += -lz
+	CDEFS += -DWITH_ZLIB
+	ifdef STATIC
+		ifdef OSX
+		# OSX links dynamically to zlib, even in static builds since it's always present in the system
+			LIBS += -lz
+		else
+			LIBS += $(STATIC_ZLIB_PATH)
+		endif
+	else
+		LIBS += -lz
+	endif
 endif
 
 # libpng config
diff -r e94795a55f13 -r 56f72f7838cc makefiledir/Makefile.config_writer
--- a/makefiledir/Makefile.config_writer	Fri Mar 31 09:09:26 2006 +0000
+++ b/makefiledir/Makefile.config_writer	Fri Mar 31 10:04:18 2006 +0000
@@ -67,6 +67,7 @@
 	$(call CONFIG_LINE,WITH_ZLIB:=$(WITH_ZLIB))
 	$(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL))
 	$(call CONFIG_LINE,WITH_PNG:=$(WITH_PNG))
+	$(call CONFIG_LINE,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH))
 	$(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA))
 	$(call CONFIG_LINE,)
 
diff -r e94795a55f13 -r 56f72f7838cc makefiledir/Makefile.libdetection
--- a/makefiledir/Makefile.libdetection	Fri Mar 31 09:09:26 2006 +0000
+++ b/makefiledir/Makefile.libdetection	Fri Mar 31 10:04:18 2006 +0000
@@ -81,8 +81,8 @@
 WITH_PNG:=$(shell $(LIBPNG-CONFIG) --version 2>/dev/null)
 
 ifdef WITH_PNG
-# LibPNG depends on Zlib
-WITH_ZLIB:=1
+	# LibPNG depends on Zlib
+	WITH_ZLIB:=1
 else
 # We go looking for zlib with a little hack
 WITH_ZLIB:=$(shell ls /usr/include | grep "zlib.h" 2>/dev/null) \
@@ -92,6 +92,22 @@
 endif
 endif
 
+ifdef WITH_ZLIB
+	TEMP:=$(shell ls /lib 2>/dev/null | grep "zlib.a")$(shell ls /lib 2>/dev/null | grep "libz.a")
+	ifdef TEMP
+		STATIC_ZLIB_PATH:=/lib/$(TEMP)
+	else
+		TEMP:=$(shell ls /usr/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/lib 2>/dev/null | grep "libz.a")
+		ifdef TEMP
+			STATIC_ZLIB_PATH:=/usr/lib/$(TEMP)
+		else
+			TEMP:=$(shell ls /usr/local/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/local/lib 2>/dev/null | grep "libz.a")
+			ifdef TEMP
+				STATIC_ZLIB_PATH:=/usr/local/lib/$(TEMP)
+			endif
+		endif
+	endif
+endif
 
 # sets the default paths
 ifdef UNIX