teknoraver / rpms / rpm

Forked from rpms/rpm 4 months ago
Clone

Blame 0011-configure.ac-use-LIBDW-always-conditionally.patch

Igor Gnatenko 082d5d
From 1b34b839b788264ffcd3ab90a0612cad3b843f7f Mon Sep 17 00:00:00 2001
Panu Matilainen 5b4d98
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Panu Matilainen 5b4d98
Date: Wed, 10 Aug 2016 13:58:30 +0200
Mark Wielaard 284dc3
Subject: [PATCH] configure.ac: use LIBDW always conditionally
Panu Matilainen 5b4d98
Panu Matilainen 5b4d98
References: https://bugzilla.redhat.com/show_bug.cgi?id=1365278
Panu Matilainen 5b4d98
Reported-and-tested-by: Neal Gompa <ngompa13@gmail.com>
Panu Matilainen 5b4d98
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Igor Gnatenko 082d5d
Igor Gnatenko 082d5d
(cherry picked from commit a82119bf352400ee891105820b804bf946d5c6ee)
Panu Matilainen 5b4d98
---
Panu Matilainen 5b4d98
 configure.ac | 7 ++++---
Panu Matilainen 5b4d98
 1 file changed, 4 insertions(+), 3 deletions(-)
Panu Matilainen 5b4d98
Panu Matilainen 5b4d98
diff --git a/configure.ac b/configure.ac
Igor Gnatenko 082d5d
index 8890c3c32..33c8f344f 100644
Panu Matilainen 5b4d98
--- a/configure.ac
Panu Matilainen 5b4d98
+++ b/configure.ac
Igor Gnatenko 082d5d
@@ -361,7 +361,8 @@ AM_CONDITIONAL(WITH_ARCHIVE,[test "$with_archive" = yes])
Panu Matilainen 5b4d98
 
Panu Matilainen 5b4d98
 #=================
Panu Matilainen 5b4d98
 # Check for elfutils libdw library with dwelf_elf_gnu_build_id.
Panu Matilainen 5b4d98
-AS_IF([test "$WITH_LIBELF" = yes],[
Panu Matilainen 5b4d98
+WITH_LIBDW_LIB=
Panu Matilainen 5b4d98
+AS_IF([test "$WITH_LIBELF" != yes],[
Panu Matilainen 5b4d98
   AC_CHECK_HEADERS([elfutils/libdwelf.h],[
Panu Matilainen 5b4d98
     AC_CHECK_LIB(dw, dwelf_elf_gnu_build_id, [
Panu Matilainen 5b4d98
       AC_DEFINE(HAVE_LIBDW, 1,
Igor Gnatenko 082d5d
@@ -370,9 +371,9 @@ AS_IF([test "$WITH_LIBELF" = yes],[
Panu Matilainen 5b4d98
       WITH_LIBDW=yes
Panu Matilainen 5b4d98
     ])
Panu Matilainen 5b4d98
   ])
Panu Matilainen 5b4d98
-  AC_SUBST(WITH_LIBDW_LIB)
Panu Matilainen 5b4d98
-  AM_CONDITIONAL(LIBDW,[test "$WITH_LIBDW" = yes])
Panu Matilainen 5b4d98
 ])
Panu Matilainen 5b4d98
+AC_SUBST(WITH_LIBDW_LIB)
Panu Matilainen 5b4d98
+AM_CONDITIONAL(LIBDW,[test "$WITH_LIBDW" = yes])
Panu Matilainen 5b4d98
 
Panu Matilainen 5b4d98
 #=================
Panu Matilainen 5b4d98
 # Process --with/without-external-db