gallium: remove TGSI opcode BREAKC

[mesa.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e3babd3909aeea3081c0b3d2a13f9735c5364285..53d52f6d52f90588360c39e2308a4d330735e9fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1814,7 +1814,9 @@ if test "x$with_dri_drivers" = xno; then
 fi
 
 # Check for expat
-PKG_CHECK_MODULES([EXPAT], [expat])
+PKG_CHECK_MODULES([EXPAT], [expat],,
+    [PKG_CHECK_MODULES([EXPAT], [expat21])]
+)
 
 dnl If $with_dri_drivers is yes, drivers will be added through
 dnl platform checks. Set DEFINES and LIB_DEPS
@@ -2646,7 +2648,7 @@ if test "x$enable_llvm" = xyes; then
     LLVM_LIBS="`$LLVM_CONFIG --libs ${LLVM_COMPONENTS}`"
 
     if test "x$enable_llvm_shared_libs" = xyes; then
-        if test $LLVM_VERSION_MAJOR -lt 4; then
+        if test $LLVM_VERSION_MAJOR -lt 4 -o "`$LLVM_CONFIG --shared-mode ${LLVM_COMPONENTS}`" = static; then
             dnl llvm-config may not give the right answer when llvm is a built as a
             dnl single shared library, so we must work the library name out for
             dnl ourselves.