meta: Avoid null access on setup_glsl_msaa_blit_shader()

[mesa.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6087e05435876f2e58222fbc324ca81eb3472da2..12f914e0f0aba7ff9b03db06bba5a0025a4953d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1660,6 +1660,7 @@ strip_unwanted_llvm_flags() {
     # Use \> (marks the end of the word)
     echo `$1` | sed \
        -e 's/-DNDEBUG\>//g' \
+       -e 's/-D_GNU_SOURCE\>//g' \
        -e 's/-pedantic\>//g' \
        -e 's/-Wcovered-switch-default\>//g' \
        -e 's/-O.\>//g' \
@@ -1694,7 +1695,7 @@ if test "x$enable_gallium_llvm" = xyes; then
     fi
 
     if test "x$LLVM_CONFIG" != xno; then
-        LLVM_VERSION=`$LLVM_CONFIG --version | grep -o '^[[0-9.]]\+'`
+        LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'`
         LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
         LLVM_BINDIR=`$LLVM_CONFIG --bindir`
         LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`