[Mesa-dev] [PATCH] configure.ac: honour --disable-libunwind if the .pc file is present

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

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

Cc: Eric Anholt <eric at anholt.net>
Reported-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7246c6017a2..cceb8df4f09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1048,12 +1048,15 @@ AC_ARG_ENABLE([libunwind],
         [LIBUNWIND="$enableval"],
         [LIBUNWIND="auto"])
 
-PKG_CHECK_MODULES(LIBUNWIND, libunwind, [HAVE_LIBUNWIND=yes], [HAVE_LIBUNWIND=no])
+PKG_CHECK_EXISTS([libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED], [enable_omx=yes], [enable_omx=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
-- 
2.12.2