From 78eb490c2c0f3d805e5d664b5ce18c09fbf1f00e Mon Sep 17 00:00:00 2001 From: Indu Bhagat Date: Mon, 12 Dec 2022 09:34:36 -0800 Subject: [PATCH] libctf: remove unnecessary zlib constructs This dependency is managed via libtool. So explicit addition to LDFLAGS and LIBS is not necessary anymore. ChangeLog: * libctf/configure: Regenerated. * libctf/configure.ac: remove zlib from LDFLAGS and LIBS. --- libctf/configure | 5 ++--- libctf/configure.ac | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libctf/configure b/libctf/configure index d3d63407cf0..cdfc0008fe5 100755 --- a/libctf/configure +++ b/libctf/configure @@ -14579,10 +14579,9 @@ OLD_CC=$CC # always want our bfd. CC="./libtool --quiet --mode=link $OLD_CC" CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS" -ZLIBDIR=`echo $zlibdir | sed 's,\$(top_builddir)/,,g'` -LDFLAGS="-L../bfd -L../libiberty $ZLIBDIR $LDFLAGS" +LDFLAGS="-L../bfd -L../libiberty $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` -LIBS="-lbfd -liberty -lz $ZSTD_LIBS $intl $LIBS" +LIBS="-lbfd -liberty $ZSTD_LIBS $intl $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF support in BFD" >&5 $as_echo_n "checking for ELF support in BFD... " >&6; } if ${ac_cv_libctf_bfd_elf+:} false; then : diff --git a/libctf/configure.ac b/libctf/configure.ac index ba4a144ce37..652e95e3968 100644 --- a/libctf/configure.ac +++ b/libctf/configure.ac @@ -90,10 +90,9 @@ OLD_CC=$CC # always want our bfd. CC="./libtool --quiet --mode=link $OLD_CC" CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS" -ZLIBDIR=`echo $zlibdir | sed 's,\$(top_builddir)/,,g'` -LDFLAGS="-L../bfd -L../libiberty $ZLIBDIR $LDFLAGS" +LDFLAGS="-L../bfd -L../libiberty $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` -LIBS="-lbfd -liberty -lz $ZSTD_LIBS $intl $LIBS" +LIBS="-lbfd -liberty $ZSTD_LIBS $intl $LIBS" AC_CACHE_CHECK([for ELF support in BFD], ac_cv_libctf_bfd_elf, [AC_TRY_LINK([#include #include -- 2.30.2