From: Dan Nicholson <dbn.lists@gmail.com>
Date: Fri, 7 Mar 2008 19:48:09 +0000 (-0800)
Subject: autoconf: Print GCC include path directly and be more robust using it
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db7fc6311086b512f63ba74d7ab6cda47b662839;p=mesa.git

autoconf: Print GCC include path directly and be more robust using it

Rather than constructing the GCC include path from `-print-search-dirs',
we can get the path directly from `-print-file-name=include'. This is
used in the Linux kernel build, for example. If no output is returned
from the command, then we don't append a -I path the the makedepend
options.
---

diff --git a/configure.ac b/configure.ac
index ec1bb8288ef..ca3f9171969 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,12 +30,13 @@ AC_PATH_PROG(MAKE, make)
 AC_PATH_PROG(MKDEP, makedepend)
 AC_PATH_PROG(SED, sed)
 
+MKDEP_OPTIONS=-fdepend
 dnl Ask gcc where it's keeping its secret headers
 if test "x$GCC" = xyes; then
-    GCC_PATH=$(gcc -print-search-dirs | sed -ne 's/install: //p')
-    MKDEP_OPTIONS="-fdepend -I${GCC_PATH}include"
-else
-    MKDEP_OPTIONS=-fdepend
+    GCC_INCLUDES=`$CC -print-file-name=include`
+    if test "x$GCC_INCLUDES" != x; then
+        MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES"
+    fi
 fi
 AC_SUBST(MKDEP_OPTIONS)