From c6237865affb080b7d654d3ea09705caf55a32fd Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 28 May 2012 15:00:54 +0000
Subject: [PATCH] Unconditionally add -lz to WX_LIBS

Originally committed to SVN as r6885.
---
 aegisub/Makefile.inc.in | 2 +-
 aegisub/src/Makefile    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/aegisub/Makefile.inc.in b/aegisub/Makefile.inc.in
index ccd1bca90..6f22236f7 100644
--- a/aegisub/Makefile.inc.in
+++ b/aegisub/Makefile.inc.in
@@ -81,7 +81,7 @@ P_DOC         = $(P_DATAROOT)/doc/aegisub/
 CFLAGS_WX          = @WX_CFLAGS@
 CXXFLAGS_WX        = @WX_CXXFLAGS@
 CPPFLAGS_WX        = @WX_CPPFLAGS@
-LIBS_WX            = @WX_LIBS@
+LIBS_WX            = @WX_LIBS@ -lz
 
 CFLAGS_FFMS2       = @FFMS2_CFLAGS@
 CFLAGS_FFTW3       = @FFTW3_CFLAGS@
diff --git a/aegisub/src/Makefile b/aegisub/src/Makefile
index 795a6691e..077b0955a 100644
--- a/aegisub/src/Makefile
+++ b/aegisub/src/Makefile
@@ -19,7 +19,6 @@ LIBS += $(LIBS_UCHARDET)
 LDFLAGS += $(LDFLAGS_CCMALLOC)
 
 ifeq (yes, $(BUILD_DARWIN))
-LIBS += -lz
 SRC += osx_utils.mm
 endif