diff options
| author | Aaron Merey <amerey@redhat.com> | 2020-07-24 15:16:20 -0400 |
|---|---|---|
| committer | Aaron Merey <amerey@redhat.com> | 2020-07-24 15:16:20 -0400 |
| commit | f6720b1cfe8f70ef5631b390780dfb53166e9ff2 (patch) | |
| tree | 55a1ce634ae58691c529a850c9669a4c829a827f /config/debuginfod.m4 | |
| parent | 6dcfb80a28a571999a8cf2346bfc4665d56912ae (diff) | |
| download | gdb-f6720b1cfe8f70ef5631b390780dfb53166e9ff2.zip gdb-f6720b1cfe8f70ef5631b390780dfb53166e9ff2.tar.gz gdb-f6720b1cfe8f70ef5631b390780dfb53166e9ff2.tar.bz2 | |
config/debuginfod.m4: Use PKG_CHECK_MODULES
Use PKG_CHECK_MODULES to set debuginfod autoconf vars. Also add
pkg.m4 to config/.
ChangeLog:
* config/debuginfod.m4: use PKG_CHECK_MODULES.
* config/pkg.m4: New file.
* configure: Rebuild.
* configure.ac: Remove AC_DEBUGINFOD.
ChangeLog/binutils:
* Makefile.am: Replace LIBDEBUGINFOD with DEBUGINFOD_LIBS.
* Makefile.in: Rebuild.
* configure: Rebuild.
* doc/Makefile.in: Rebuild.
ChangeLog/gdb:
* Makefile.in: Replace LIBDEBUGINFOD with DEBUGINFOD_LIBS.
* configure: Rebuild.
Diffstat (limited to 'config/debuginfod.m4')
| -rw-r--r-- | config/debuginfod.m4 | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/config/debuginfod.m4 b/config/debuginfod.m4 index 9979abe..f9eb098 100644 --- a/config/debuginfod.m4 +++ b/config/debuginfod.m4 @@ -1,38 +1,30 @@ -dnl Copyright (C) 1997-2019 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2020 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. +m4_include([../config/pkg.m4]) + AC_DEFUN([AC_DEBUGINFOD], [ -# Enable debuginfod +# Handle optional debuginfod support AC_ARG_WITH([debuginfod], - AC_HELP_STRING([--with-debuginfod], - [Enable debuginfo lookups with debuginfod (auto/yes/no)]), - [], [with_debuginfod=auto]) + AC_HELP_STRING([--with-debuginfod], [Enable debuginfo lookups with debuginfod (auto/yes/no)]), + [], [with_debuginfod=auto]) AC_MSG_CHECKING([whether to use debuginfod]) AC_MSG_RESULT([$with_debuginfod]) -if test "${with_debuginfod}" = no; then - AC_MSG_WARN([debuginfod support disabled; some features may be unavailable.]) +if test "x$with_debuginfod" != xno; then + PKG_CHECK_MODULES([DEBUGINFOD], [libdebuginfod >= 0.179], + [AC_DEFINE([HAVE_LIBDEBUGINFOD], [1], [Define to 1 if debuginfod is enabled.])], + [if test "x$with_debuginfod" = xyes; then + AC_MSG_ERROR(["--with-debuginfod was given, but libdebuginfod is missing or unusable."]) + else + AC_MSG_WARN([libdebuginfod is missing or unusable; some features may be unavailable.]) + fi]) else - AC_CHECK_LIB([debuginfod], [debuginfod_begin], [have_debuginfod_lib=yes]) - AC_CHECK_DECL([debuginfod_begin], [have_debuginfod_h=yes], [], - [#include <elfutils/debuginfod.h>]) - if test "x$have_debuginfod_lib" = "xyes" -a \ - "x$have_debuginfod_h" = "xyes"; then - AC_DEFINE([HAVE_LIBDEBUGINFOD], [1], - [Define to 1 if debuginfod is enabled.]) - AC_SUBST([LIBDEBUGINFOD], ["-ldebuginfod"]) - else - AC_SUBST([LIBDEBUGINFOD], []) - if test "$with_debuginfod" = yes; then - AC_MSG_ERROR([debuginfod is missing or unusable]) - else - AC_MSG_WARN([debuginfod is missing or unusable; some features may be unavailable.]) - fi - fi + AC_MSG_WARN([debuginfod support disabled; some features may be unavailable.]) fi ]) |