Mesa (master): Revert "configure.ac: Use PKG_CHECK_VAR for libclc."

Matt Turner mattst88 at kemper.freedesktop.org
Wed Mar 8 05:24:15 UTC 2017


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

Author: Matt Turner <mattst88 at gmail.com>
Date:   Tue Mar  7 21:23:57 2017 -0800

Revert "configure.ac: Use PKG_CHECK_VAR for libclc."

This reverts commit 706074cc96cec8bad6c3569fc53b0b3a05ad176f.

---

 configure.ac | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 87cfbaf..8fbadc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2018,8 +2018,10 @@ if test "x$enable_opencl" = xyes; then
                     PKG_CONFIG_PATH environment variable.
                     By default libclc.pc is installed to /usr/local/share/pkgconfig/])
     else
-        PKG_CHECK_VAR([LIBCLC_INCLUDEDIR], [libclc], [includedir])
-        PKG_CHECK_VAR([LIBCLC_LIBEXECDIR], [libclc], [libexecdir])
+        LIBCLC_INCLUDEDIR=`$PKG_CONFIG --variable=includedir libclc`
+        LIBCLC_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir libclc`
+        AC_SUBST([LIBCLC_INCLUDEDIR])
+        AC_SUBST([LIBCLC_LIBEXECDIR])
     fi
 
     gallium_st="$gallium_st clover"




More information about the mesa-commit mailing list