diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2018-08-05 20:24:59 +0000 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2018-08-05 20:24:59 +0000 |
| commit | 2206fb89403bef0b06818c0f180a85d98c2674c2 (patch) | |
| tree | ae1c472a9b13bde9a7b8206efe36e41b3c5c0e6a | |
| parent | dd5faf200e29d4e784ce0b484c79fd9dc4eead90 (diff) | |
| download | gcc-2206fb89403bef0b06818c0f180a85d98c2674c2.zip gcc-2206fb89403bef0b06818c0f180a85d98c2674c2.tar.gz gcc-2206fb89403bef0b06818c0f180a85d98c2674c2.tar.bz2 | |
libbacktrace: Suppress the default action-if-found for AC_CHECK_LIBS.
Zlib is not a dependency of libbacktrace, and so it shouldn't be added
to LIBS.
libbacktrace/
* configure.ac: Move define of HAVE_ZLIB into check for -lz.
* Makefile.in: Regenerate.
* config.h.in: Likewise.
* configure: Likewise.
From-SVN: r263320
| -rw-r--r-- | libbacktrace/ChangeLog | 7 | ||||
| -rw-r--r-- | libbacktrace/Makefile.in | 2 | ||||
| -rw-r--r-- | libbacktrace/config.h.in | 3 | ||||
| -rwxr-xr-x | libbacktrace/configure | 10 | ||||
| -rw-r--r-- | libbacktrace/configure.ac | 6 |
5 files changed, 11 insertions, 17 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index 0a117a0..140bf4d 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,10 @@ +2018-08-05 Iain Buclaw <ibuclaw@gdcproject.org> + + * configure.ac: Move define of HAVE_ZLIB into check for -lz. + * Makefile.in: Regenerate. + * config.h.in: Likewise. + * configure: Likewise. + 2018-08-01 Tony Reix <tony.reix@atos.net> * xcoff.c (struct xcoff_line, struct xcoff_line_vector): Remove. diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in index f7f849b..8b5dc3e 100644 --- a/libbacktrace/Makefile.in +++ b/libbacktrace/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # Makefile.am -- Backtrace Makefile. -# Copyright (C) 2012-2017 Free Software Foundation, Inc. +# Copyright (C) 2012-2018 Free Software Foundation, Inc. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are diff --git a/libbacktrace/config.h.in b/libbacktrace/config.h.in index c19b6e4..6205fc5 100644 --- a/libbacktrace/config.h.in +++ b/libbacktrace/config.h.in @@ -34,9 +34,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `z' library (-lz). */ -#undef HAVE_LIBZ - /* Define to 1 if you have the <link.h> header file. */ #undef HAVE_LINK_H diff --git a/libbacktrace/configure b/libbacktrace/configure index 87cadda..d5a9d79 100755 --- a/libbacktrace/configure +++ b/libbacktrace/configure @@ -12973,19 +12973,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 $as_echo "$ac_cv_lib_z_compress" >&6; } if test "x$ac_cv_lib_z_compress" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBZ 1 -_ACEOF - - LIBS="-lz $LIBS" - -fi - -if test $ac_cv_lib_z_compress = "yes"; then $as_echo "#define HAVE_ZLIB 1" >>confdefs.h fi + if test "$ac_cv_lib_z_compress" = yes; then HAVE_ZLIB_TRUE= HAVE_ZLIB_FALSE='#' diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac index 6f7b5ea..fd36745 100644 --- a/libbacktrace/configure.ac +++ b/libbacktrace/configure.ac @@ -426,10 +426,8 @@ AC_SUBST(PTHREAD_CFLAGS) AM_CONDITIONAL(HAVE_PTHREAD, test "$libgo_cv_lib_pthread" = yes) -AC_CHECK_LIB([z], [compress], []) -if test $ac_cv_lib_z_compress = "yes"; then - AC_DEFINE(HAVE_ZLIB, 1, [Define if -lz is available.]) -fi +AC_CHECK_LIB([z], [compress], + [AC_DEFINE(HAVE_ZLIB, 1, [Define if -lz is available.])]) AM_CONDITIONAL(HAVE_ZLIB, test "$ac_cv_lib_z_compress" = yes) dnl Test whether the linker supports the --compress_debug_sections option. |