From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 13 Apr 2017 18:47:17 +0000 (+0100)
Subject: configure.ac: honour --disable-libunwind if the .pc file is present
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3bcef6aa245e269ee6ea3ef347148553e80e6df0;p=mesa.git

configure.ac: honour --disable-libunwind if the .pc file is present

We should check the presence in order to determine if we should
[implicitly] set the CFLAGS/LIBS

v2: Drop spurious OMX hunk (Eric)

Cc: Eric Anholt <eric@anholt.net>
Reported-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/configure.ac b/configure.ac
index ef19733423e..ab33ca03805 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1074,12 +1074,13 @@ AC_ARG_ENABLE([libunwind],
         [LIBUNWIND="$enableval"],
         [LIBUNWIND="auto"])
 
-PKG_CHECK_MODULES(LIBUNWIND, libunwind, [HAVE_LIBUNWIND=yes], [HAVE_LIBUNWIND=no])
+PKG_CHECK_EXISTS(libunwind, [HAVE_LIBUNWIND=yes], [HAVE_LIBUNWIND=no])
 if test "x$LIBUNWIND" = "xauto"; then
     LIBUNWIND="$HAVE_LIBUNWIND"
 fi
 
 if test "x$LIBUNWIND" = "xyes"; then
+    PKG_CHECK_MODULES(LIBUNWIND, libunwind)
     if test "x$HAVE_LIBUNWIND" != "xyes"; then
         AC_MSG_ERROR([libunwind requested but not installed.])
     fi