Module: Mesa
Branch: master
Commit: 3bcef6aa245e269ee6ea3ef347148553e80e6df0
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3bcef6aa245e269ee6ea3ef347148553e80e6df0

Author: Emil Velikov <[email protected]>
Date:   Thu Apr 13 19:47:17 2017 +0100

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 <[email protected]>
Reported-by: Eric Anholt <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>

---

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ef19733423..ab33ca0380 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

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to