Mesa (mesa_7_4_branch): autoconf: Use include-fixed directory with makedepend on newer GCC
Brian Paul
brianp at kemper.freedesktop.org
Fri Feb 13 16:10:30 UTC 2009
Module: Mesa
Branch: mesa_7_4_branch
Commit: d440647eb8e65b9a199b0d98049bd1fbb85d31c7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d440647eb8e65b9a199b0d98049bd1fbb85d31c7
Author: Brian Paul <brianp at vmware.com>
Date: Fri Feb 13 09:10:09 2009 -0700
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 at gmail.com>
Signed-off-by: Julien Cristau <jcristau at debian.org>
(cherry picked from master, commit a3d223f0d204670696338d61fe4870ff2a41f210)
---
configure.ac | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 33c1072..ba48e9d 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])
More information about the mesa-commit
mailing list