configure.ac: Add variables LLVM_CPPFLAGS and LLVM_LIBDIR

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 6be9777..ce02ae6 100644 (file)
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -34,8 +34,10 @@ X11_LIBS = @X11_LIBS@
 X11_CFLAGS = @X11_CFLAGS@
 LLVM_BINDIR = @LLVM_BINDIR@
 LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CPPFLAGS = @LLVM_CPPFLAGS@
 LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
 LLVM_LDFLAGS = @LLVM_LDFLAGS@
+LLVM_LIBDIR = @LLVM_LIBDIR@
 LLVM_LIBS = @LLVM_LIBS@
 LLVM_INCLUDEDIR = @LLVM_INCLUDEDIR@
 GLW_CFLAGS = @GLW_CFLAGS@

diff --git a/configure.ac b/configure.ac
index 7ddd5fa..07b6483 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1705,7 +1705,9 @@ fi
 
 AC_SUBST([LLVM_BINDIR])
 AC_SUBST([LLVM_CFLAGS])
+AC_SUBST([LLVM_CPPFLAGS])
 AC_SUBST([LLVM_CXXFLAGS])
+AC_SUBST([LLVM_LIBDIR])
 AC_SUBST([LLVM_LIBS])
 AC_SUBST([LLVM_LDFLAGS])
 AC_SUBST([LLVM_INCLUDEDIR])
@@ -1856,7 +1858,9 @@ if test "x$enable_gallium_llvm" = xyes; then
        LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
        LLVM_BINDIR=`$LLVM_CONFIG --bindir`
        LLVM_CXXFLAGS=`$LLVM_CONFIG --cxxflags`
+       LLVM_CPPFLAGS=`$LLVM_CONFIG --cppflags`
        LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
+       LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
        DEFINES="${DEFINES} -DHAVE_LLVM=`echo $LLVM_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/0x0\10\2/g'`"
        MESA_LLVM=1
     else