From: Dan Nicholson <dbn.lists@gmail.com>
Date: Fri, 30 Jan 2009 18:52:09 +0000 (-0800)
Subject: autoconf: Use include-fixed directory with makedepend on newer GCC
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a3d223f0d204670696338d61fe4870ff2a41f210;p=mesa.git

autoconf: Use include-fixed directory with makedepend on newer GCC

On newer GCC releases, the compiler's headers have been split between
the include and include-fixed directories. Add both if the directories
exist.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/configure.ac b/configure.ac
index 33c107266a2..ba48e9d132a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,10 +46,14 @@ esac
 MKDEP_OPTIONS=-fdepend
 dnl Ask gcc where it's keeping its secret headers
 if test "x$GCC" = xyes; then
-    GCC_INCLUDES=`$CC -print-file-name=include`
-    if test "x$GCC_INCLUDES" != x; then
-        MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES"
-    fi
+    for dir in include include-fixed; do
+        GCC_INCLUDES=`$CC -print-file-name=$dir`
+        if test "x$GCC_INCLUDES" != x && \
+           test "$GCC_INCLUDES" != "$dir" && \
+           test -d "$GCC_INCLUDES"; then
+            MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES"
+        fi
+    done
 fi
 AC_SUBST([MKDEP_OPTIONS])