Fix regression in recent change related to zlib in nonstandard location

To allow for specifying a -L flag in LDFLAGS and have it take effect for
-lz, 0220de9c8ebfb18caae2ac1aa163d060e98ceade put -lz in extra_libs
instead of extra_ldflags. However, extra_libs is supposed to contain
paths to libraries which are prerequisites of the ccache link rule, and
some older versions of make got confused by seeing -lz as a
prerequisite.

This fix is to revert 0220de9c8ebfb18caae2ac1aa163d060e98ceade and
instead make sure that LDFLAGS comes before extra_ldflags.

diff --git a/Makefile.in b/Makefile.in
index e7515b1d9e84fa016e7a57cbb594f7560ba3645e..d3621cd66e44d035a5ef1796084c21638ad050d5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@ RANLIB = @RANLIB@
 
 all_cflags = $(CFLAGS)
 all_cppflags = @DEFS@ @extra_cppflags@ -DSYSCONFDIR=$(sysconfdir) -I. -I$(srcdir) $(CPPFLAGS)
-all_ldflags = @extra_ldflags@ $(LDFLAGS)
+all_ldflags = $(LDFLAGS) @extra_ldflags@
 extra_libs = @extra_libs@
 
 base_sources = \

diff --git a/NEWS.txt b/NEWS.txt
index f13feeb7f67ad52200f536fc96d10665bdaa6505..eaeadf6e2d1fce7114e99e373cba53737014fca2 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -2,6 +2,16 @@ ccache news
 ===========
 
 
+Unreleased 3.2.4
+----------------
+
+Bug fixes
+~~~~~~~~~
+
+- Fixed build error related to zlib on systems with older make versions
+  (regression in ccache 3.2.3).
+
+
 ccache 3.2.3
 ------------
 Release date: 2015-08-16

diff --git a/configure.ac b/configure.ac
index 8d8ce92ec7863073b01878d72b3477436ce1121f..9e655889488cdc0f2b9f63197e922e649c6930a2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,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
 
 dnl Linking on Windows needs ws2_32