Make zlib mandatory.

Explicitly link libelf and libdw with -lz.

Signed-off-by: Mark Wielaard <mjw@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index db1b3b23d8fab2edeb43bff58e5e73d777802b61..bbe0b8cfb1b34ec4e13180f3b51de4416c103b1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-16  Mark Wielaard  <mjw@redhat.com>
+
+       * configure.ac: Make zlib mandatory.
+
 2015-10-15  Mark Wielaard  <mjw@redhat.com>
 
        * configure.ac: Set version to 0.164.

diff --git a/configure.ac b/configure.ac
index 5d691c9f3cfc4e0f07e7b1c8eb831a086c25bc3e..e01075493066092bee5130ac12f70cceae26bb1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -240,11 +240,17 @@ AC_SUBST([LIBEBL_SUBDIR])
 AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR")
 AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.])
 
-dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
-dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
+dnl zlib is mandatory.
 save_LIBS="$LIBS"
 LIBS=
 eu_ZIPLIB(zlib,ZLIB,z,gzdirect,gzip)
+AS_IF([test "x$with_zlib" = xno], [AC_MSG_ERROR("zlib not found")])
+LIBS="$save_LIBS"
+
+dnl Test for bzlib and xz/lzma, gives BZLIB/LZMALIB .am
+dnl conditional and config.h USE_BZLIB/USE_LZMALIB #define.
+save_LIBS="$LIBS"
+LIBS=
 eu_ZIPLIB(bzlib,BZLIB,bz2,BZ2_bzdopen,bzip2)
 eu_ZIPLIB(lzma,LZMA,lzma,lzma_auto_decoder,[LZMA (xz)])
 zip_LIBS="$LIBS"

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 4242a7c12a4eba9695b812f7c70ba82c5897f0e5..99ec2e8c54870add0a56a922a5ba141415f5e045 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-16  Mark Wielaard  <mjw@redhat.com>
+
+       * Makefile.am (libdw.so): Add -lz.
+
 2015-10-14  Chih-Hung Hsieh  <chh@google.com>
 
        * cfi.c (execute_cfi): Move nested functions 'enough_registers'

diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 2da0db677de0cc6a5d4e641e6ec3f6851c9cb9f0..082d96c735fe608b9e67da7b4aca24b9122feef9 100644 (file)
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -112,7 +112,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a \
                -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
                -Wl,--version-script,$<,--no-undefined \
                -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
-               -ldl $(argp_LDADD) $(zip_LIBS)
+               -ldl -lz $(argp_LDADD) $(zip_LIBS)
        @$(textrel_check)
        $(AM_V_at)ln -fs $@ $@.$(VERSION)
 

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 18d7797497f3d1a2bf57e83d87a76fde35be9a93..fbe8e3aef9b1268ef0a1a4e478682be434877024 100644 (file)
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-16  Mark Wielaard  <mjw@redhat.com>
+
+       * Makefile.am (libelf_so_LDLIBS): Add -lz.
+
 2015-10-14  Mark Wielaard  <mjw@redhat.com>
 
        * elf.h: Update from glibc. Add section compression constants and

diff --git a/libelf/Makefile.am b/libelf/Makefile.am
index 91a7d073e1640c81ce0779648f47368249cba19f..4a4131c1cf59a709737f70562a52fbee66c972fb 100644 (file)
--- a/libelf/Makefile.am
+++ b/libelf/Makefile.am
@@ -93,7 +93,7 @@ libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \
 libelf_pic_a_SOURCES =
 am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
 
-libelf_so_LDLIBS =
+libelf_so_LDLIBS = -lz
 if USE_LOCKS
 libelf_so_LDLIBS += -lpthread
 endif

diff --git a/src/ChangeLog b/src/ChangeLog
index f9e3b4a55a84aef383ce24703176618a70fad2bd..d6d2936e1b6465223944fda1cab2297fcfc62fe0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
        * elflint.c (check_symtab): Don't check TLS symbol value against TLS

diff --git a/src/Makefile.am b/src/Makefile.am
index 04ae3cbc51ff8be139f1b92edfb0140afedfa9a4..e2c494c0f82ee14d95e37237616f6cafea459356 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,8 +72,8 @@ CLEANFILES += make-debug-archive
 
 if BUILD_STATIC
 libasm = ../libasm/libasm.a
-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
 else
 libasm = ../libasm/libasm.so
 libdw = ../libdw/libdw.so

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 1913fbbb91d2dd8f1a009e2d330eb32a85d8c7a6..69a25fc6e8b27534e1ffde8b514a88b1a08f0acd 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e04707cd06edb4dda8296ff4c09f7ffbefaa7aa1..30cf137c60e7c2ce1814c09a505ba3a0e746a889 100644 (file)
--- 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