From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 17 Jan 2012 20:26:05 +0000 (-0600)
Subject: Add -I../.. -L../.. to CFLAGS for minizip and miniunzip.
X-Git-Tag: v1.2.6~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad88c19baae5203a7405ec88ac5becc1b4a641a4;p=thirdparty%2Fzlib-ng.git

Add -I../.. -L../.. to CFLAGS for minizip and miniunzip.

Trying to build miniunzip utility from contrib/minizip after an
autoreconf -f produces

	[...]
	In file included from minizip.c:61:0:
	zip.h:50:18: fatal error: zlib.h: No such file or directory

unless zlib is already installed.  Use AM_CFLAGS to set the include
path and library path to point to the just-build copy of zlib to
fix this.  (This was already done for libminizip but not the binaries
that use it before this patch.)
---

diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am
index 7a1e3dbff..8f0459bab 100644
--- a/contrib/minizip/Makefile.am
+++ b/contrib/minizip/Makefile.am
@@ -6,7 +6,7 @@ libminizip_la_SOURCES = \
 	unzip.c \
 	zip.c
 
-libminizip_la_CFLAGS = -I../.. -L../..
+AM_CFLAGS = -I../.. -L../..
 libminizip_la_LDFLAGS = -version-info 1:0:0 -lz
 
 minizip_includedir = $(includedir)/minizip