From aa3a6439d1f398ac56127057bbf75b6e4536721f Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Sun, 19 Apr 2015 15:43:41 +0200
Subject: [PATCH] Remove elfutils checks

---
 configure.ac       | 47 ----------------------------------------------
 src/shared/build.h |  7 -------
 2 files changed, 54 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0632c51c6..183240554 100644
--- a/configure.ac
+++ b/configure.ac
@@ -485,52 +485,6 @@ fi
 
 AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"])
 
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([elfutils],
-        AS_HELP_STRING([--disable-elfutils],[Disable optional ELFUTILS support]),
-                [case "${enableval}" in
-                        yes) have_elfutils=yes ;;
-                        no) have_elfutils=no ;;
-                        *) AC_MSG_ERROR(bad value ${enableval} for --disable-elfutils) ;;
-                esac],
-                [have_elfutils=auto])
-
-if test "x${have_elfutils}" != xno ; then
-        AC_CHECK_HEADERS(
-                [elfutils/libdwfl.h],
-                [],
-                [if test "x$have_elfutils" = xyes ; then
-                        AC_MSG_ERROR([*** ELFUTILS headers not found.])
-                fi])
-
-        AC_CHECK_LIB(
-                [dw],
-                [dwfl_begin],
-                [],
-                [if test "x$have_elfutils" = xyes ; then
-                        AC_MSG_ERROR([*** ELFUTILS libs not found.])
-                fi])
-
-        AC_CHECK_LIB(
-                [dw],
-                [dwfl_core_file_attach],
-                [have_elfutils=yes],
-                [if test "x$have_elfutils" = xyes ; then
-                        AC_MSG_ERROR([*** ELFUTILS >= 158 is required.])
-                fi])
-
-        if test "x$have_elfutils" = xyes ; then
-                ELFUTILS_LIBS="-lelf -ldw"
-                AC_DEFINE(HAVE_ELFUTILS, 1, [ELFUTILS available])
-        else
-                have_elfutils=no
-        fi
-else
-        ELFUTILS_LIBS=
-fi
-AC_SUBST(ELFUTILS_LIBS)
-AM_CONDITIONAL(HAVE_ELFUTILS, [test "$have_elfutils" = "yes"])
-
 # ------------------------------------------------------------------------------
 have_libcryptsetup=no
 AC_ARG_ENABLE(libcryptsetup, AS_HELP_STRING([--disable-libcryptsetup], [disable libcryptsetup tools]))
@@ -1155,7 +1109,6 @@ AC_MSG_RESULT([
         GNUTLS:                  ${have_gnutls}
         libcurl:                 ${have_libcurl}
         libidn:                  ${have_libidn}
-        ELFUTILS:                ${have_elfutils}
         binfmt:                  ${have_binfmt}
         vconsole:                ${have_vconsole}
         bootchart:               ${have_bootchart}
diff --git a/src/shared/build.h b/src/shared/build.h
index eeaf9891e..4583afd0e 100644
--- a/src/shared/build.h
+++ b/src/shared/build.h
@@ -75,12 +75,6 @@
 #define _BLKID_FEATURE_ "-BLKID"
 #endif
 
-#ifdef HAVE_ELFUTILS
-#define _ELFUTILS_FEATURE_ "+ELFUTILS"
-#else
-#define _ELFUTILS_FEATURE_ "-ELFUTILS"
-#endif
-
 #ifdef HAVE_LIBIDN
 #define _IDN_FEATURE_ "+IDN"
 #else
@@ -97,5 +91,4 @@
         _ACL_FEATURE_ " "                                               \
         _SECCOMP_FEATURE_ " "                                           \
         _BLKID_FEATURE_ " "                                             \
-        _ELFUTILS_FEATURE_ " "                                          \
         _IDN_FEATURE_
-- 
2.30.2