From: Joel Rosdahl <joel@rosdahl.net>
Date: Thu, 13 Sep 2012 18:40:18 +0000 (+0200)
Subject: Don't make -lz an explicit dependency if there is a system zlib
X-Git-Tag: v3.2~95
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c252fecea27bace53e3000f6642bfe217cc40ef8;p=thirdparty%2Fccache.git

Don't make -lz an explicit dependency if there is a system zlib
---

diff --git a/Makefile.in b/Makefile.in
index e4d146454..b561a3e7b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,7 +53,7 @@ files_to_distclean = Makefile config.h config.log config.status
 all: ccache$(EXEEXT)
 
 ccache$(EXEEXT): $(ccache_objs) $(all_libs)
-	$(CC) $(all_cflags) $(all_ldflags) -o $@ $(ccache_objs) $(all_libs)
+	$(CC) $(all_cflags) -o $@ $(ccache_objs) $(all_ldflags) $(all_libs)
 
 .PHONY: install
 install: all
@@ -86,7 +86,7 @@ quicktest: test/main$(EXEEXT)
 	test/main$(EXEEXT)
 
 test/main$(EXEEXT): $(base_objs) $(test_objs) $(all_libs)
-	$(CC) $(all_cflags) $(all_ldflags) -o $@ $(base_objs) $(test_objs) $(all_libs)
+	$(CC) $(all_cflags) -o $@ $(base_objs) $(test_objs) $(all_ldflags) $(all_libs)
 
 test/main.o: test/suites.h
 
diff --git a/configure.ac b/configure.ac
index 93198e367..3c546929d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,7 @@ if test x${use_bundled_zlib} = xyes; then
     extra_libs="zlib/libz.a"
     mkdir -p zlib
 else
-    extra_libs="-lz"
+    extra_ldflags="-lz"
 fi
 
 AC_C_INLINE