From 78753f6221c4dc6553bbdc28526723cf2a6bd4c0 Mon Sep 17 00:00:00 2001 From: Tudor Bosman Date: Mon, 24 Oct 2016 20:04:41 -0700 Subject: [PATCH] No need for libdwarf, only the header file matters Summary: folly/experimental/symbolizer doesn't actually link with libdwarf, it only requires dwarf.h. Closes https://github.com/facebook/folly/pull/501 Differential Revision: D4068438 Pulled By: djwatson fbshipit-source-id: 6339eabf8fceac300caafb478c003833768125fd --- README.md | 2 +- folly/configure.ac | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 451ad71d..fcc3f9f0 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ sudo apt-get install \ libssl-dev ``` -If advanced debugging functionality for tests are required +If advanced debugging functionality is required ``` sudo apt-get install \ diff --git a/folly/configure.ac b/folly/configure.ac index d4acc99b..ba3efd72 100644 --- a/folly/configure.ac +++ b/folly/configure.ac @@ -568,12 +568,11 @@ AC_ARG_ENABLE([follytestmain], use_follytestmain=yes # libdwarf used to install in /usr/include, now installs in /usr/include/libdwarf. -AC_SEARCH_LIBS([dwarf_init], [dwarf]) AC_CHECK_HEADERS([libdwarf/dwarf.h dwarf.h], [break]) # Check whether we have both the library and the header have_libdwarf=no -AS_IF([test "x${ac_cv_search_dwarf_init}" != xno && test "x${ac_cv_header_libdwarf_dwarf_h}" = xyes], [have_libdwarf=yes]) -AS_IF([test "x${ac_cv_search_dwarf_init}" != xno && test "x${ac_cv_header_dwarf_h}" = xyes], [have_libdwarf=yes]) +AS_IF([test "x${ac_cv_header_libdwarf_dwarf_h}" = xyes], [have_libdwarf=yes]) +AS_IF([test "x${ac_cv_header_dwarf_h}" = xyes], [have_libdwarf=yes]) if test "x${follytestmain}" = "xyes"; then AS_IF([test "x${have_libdwarf}" = xno], [AC_MSG_ERROR([Please install libdwarf development library and headers])]) AC_CHECK_HEADERS([elf.h],, AC_MSG_ERROR([Please install libelf development package])) -- 2.34.1