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

diff --git a/Makefile.in b/Makefile.in
index e4d146454d69446c549f06c976d8924a993a56b7..b561a3e7b63309dabb7b121dcc5284ef6a8742fb 100644 (file)
--- 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 93198e3674530e90166739fd48aeac689bc8ab30..3c546929d321ae69b16bd94eb44f53d8af35b21a 100644 (file)
--- 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