Drop supporting insource-tree libelf/libdwarf.

diff --git a/Makefile.am b/Makefile.am
index 661c157..c606f26 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = CHANGES ChangeLog CREDITS Doxyheader GROUPS INSTALL \
        config.site db db3/configure installplatform platform* \
        rpm.magic rpmpopt-$(VERSION)
 
-SUBDIRS = po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build python tools scripts doc .
+SUBDIRS = po misc @WITH_ZLIB_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build python tools scripts doc .
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = rpm.pc

diff --git a/configure.ac b/configure.ac
index 3cf7b8c..4f9068d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -418,8 +418,7 @@ dnl will fail.
 AC_CHECK_LIB(port, writev)
 
 #=================
-# Check for libelf library. Prefer external, then internal, otherwise none.
-WITH_ELFUTILS_SUBDIR=
+# Check for libelf library. Prefer external, otherwise none.
 WITH_LIBELF_INCLUDE=
 WITH_LIBELF_LIB=
 AC_CHECK_HEADER([libelf.h])
@@ -429,16 +428,7 @@ AC_CHECK_HEADER([gelf.h], [
            AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).])
            WITH_LIBELF_LIB="-lelf"
        ])
-    ], [
-       if test -d elfutils/libelf ; then
-           AC_DEFINE(HAVE_GELF_H, 1, [Define to 1 if you have the <gelf.h> header file.])
-           AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).])
-           WITH_ELFUTILS_SUBDIR=elfutils
-           WITH_LIBELF_INCLUDE="-I\${top_srcdir}/${WITH_ELFUTILS_SUBDIR}/libelf"
-           WITH_LIBELF_LIB="\${top_builddir}/${WITH_ELFUTILS_SUBDIR}/libelf/libelf.a"
-       fi
 ])
-AC_SUBST(WITH_ELFUTILS_SUBDIR)
 AC_SUBST(WITH_LIBELF_INCLUDE)
 AC_SUBST(WITH_LIBELF_LIB)
 
@@ -447,12 +437,6 @@ WITH_LIBDWARF_DEBUGEDIT=
 AC_CHECK_HEADER([dwarf.h], [
   AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
   WITH_LIBDWARF_DEBUGEDIT="debugedit"
-],[
-  if test -d elfutils/libdwarf ; then
-    AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
-    WITH_LIBDWARF_INCLUDE="-I\${top_srcdir}/${WITH_ELFUTILS_SUBDIR}/libdwarf"
-    WITH_LIBDWARF_DEBUGEDIT="debugedit"
-  fi
 ])
 AC_SUBST(WITH_LIBDWARF_INCLUDE)
 AC_SUBST(WITH_LIBDWARF_DEBUGEDIT)