From 7d5767333ac4cb5f3b3443aa13d48ccd5e9e028d Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 27 Mar 2017 10:55:40 +0200 Subject: [PATCH] Fix build if libdwarf dir missing I was getting errors from -Werror=missing-include-dirs due to $includedir/libdwarf not existing when builing in a different prefix than /usr. --- configure.ac | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fdd73fb2..65cfae4e 100644 --- a/configure.ac +++ b/configure.ac @@ -271,8 +271,17 @@ AC_ARG_WITH([dwarf-header], provided, or it will be searched for in includedir])])], [with_dwarf_header=yes]) +# We need to check these exist, because otherwise -Werror=missing-include-dirs errors out +LIBDWARF_INCLUDES= +if test -d $(eval echo \"$includedir\")/libdwarf; then + LIBDWARF_INCLUDES="$LIBDWARF_INCLUDES -I$(eval echo \"$includedir\")/libdwarf" +fi +if test -d /usr/include/libdwarf; then + LIBDWARF_INCLUDES="$LIBDWARF_INCLUDES -I/usr/include/libdwarf" +fi + AS_IF([test "x$with_dwarf_header" = "xyes"], - [CPPFLAGS="$CPPFLAGS -I$(eval echo \"$includedir\")/libdwarf -I/usr/include/libdwarf" + [CPPFLAGS="$CPPFLAGS $LIBDWARF_INCLUDES" AC_CHECK_HEADER([dwarf.h]) AS_IF([test "x$ac_cv_header_dwarf_h" != "xyes"], [AC_MSG_ERROR([dwarf.h is required but was not found; locate it using --with-dwarf-header=/path/containing/header])])],