summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2015-10-16 23:07:12 +0200
committerMark Wielaard <mjw@redhat.com>2015-10-26 13:52:31 +0100
commit528cb45fc99a1f402ac153891ac7c007921699ef (patch)
tree0dffe0f711a8b037cb6f73b5b54ec2993186171a /tests
parent5eb3e901f9ffdc02d80f5df8f6963261a23f977c (diff)
downloadelfutils-528cb45fc99a1f402ac153891ac7c007921699ef.tar.gz
Make zlib mandatory.
Explicitly link libelf and libdw with -lz. Signed-off-by: Mark Wielaard <mjw@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/ChangeLog5
-rw-r--r--tests/Makefile.am4
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 1913fbbb..69a25fc6 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,10 @@
2015-10-16 Mark Wielaard <mjw@redhat.com>
+ * Makefile.am [BUILD_STATIC] (libdw): Add -lz.
+ [BUILD_STATIC] (libelf): Likewise.
+
+2015-10-16 Mark Wielaard <mjw@redhat.com>
+
* Makefile.am (dwfl_proc_attach_LDFLAGS): Add AM_LDFLAGS.
2015-10-09 Josh Stone <jistone@redhat.com>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e04707cd..30cf137c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -353,8 +353,8 @@ libasm = -lasm
libebl = -lebl
else !STANDALONE
if BUILD_STATIC
-libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) $(libebl) -ldl
-libelf = ../libelf/libelf.a
+libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl
+libelf = ../libelf/libelf.a -lz
libasm = ../libasm/libasm.a
else
libdw = ../libdw/libdw.so