From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Mar 2010 15:27:54 +0000 (+0100)
Subject: Merge mainline into emu-mod
X-Git-Tag: 1.99~1017^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dae79b6b057ce8a396b2efb7ed340a0f14b80b88;p=thirdparty%2Fgrub.git

Merge mainline into emu-mod
---

dae79b6b057ce8a396b2efb7ed340a0f14b80b88
diff --cc configure.ac
index f3fcd8c48,e06b0a55c..813ce9449
--- a/configure.ac
+++ b/configure.ac
@@@ -517,6 -522,19 +523,21 @@@ enable_efiemu=n
  fi
  AC_SUBST([enable_efiemu])
  
++if test "$platform" != emu; then
+ AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
+   SAVED_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+ int va_arg_func (int fixed, va_list args);]], [[]])],
+       [grub_cv_cc_isystem=yes],
+       [grub_cv_cc_isystem=no])
+   CPPFLAGS="$SAVED_CPPFLAGS"
+ ])
+ 
+ if test x"$grub_cv_cc_isystem" = xyes ; then
+   TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+ fi
++fi
  
  # Restore the flags.
  CC="$tmp_CC"