From c252fecea27bace53e3000f6642bfe217cc40ef8 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Thu, 13 Sep 2012 20:40:18 +0200 Subject: [PATCH] Don't make -lz an explicit dependency if there is a system zlib --- Makefile.in | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 -- 2.47.3