config/debuginfod.m4: Use PKG_CHECK_MODULES

[thirdparty/binutils-gdb.git] / config / debuginfod.m4

diff --git a/config/debuginfod.m4 b/config/debuginfod.m4
index 9979abe89d05b8b8ed4258563d13da5c9371b680..f9eb0988e3547411968cbfa627a655e49d5ffcd4 100644 (file)
--- 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.
 
 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],
 [
 AC_DEFUN([AC_DEBUGINFOD],
 [

-# Enable debuginfod
+# Handle optional debuginfod support

 AC_ARG_WITH([debuginfod],
 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])
 
 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
 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
 ])
 fi
 ])