* configure.ac: Make error messages less confusing by testing for

-Wtrampolines rather than -Wno-trampolines (since -Wno-* is always
accepted, but produces a diagnostic if something else is wrong).

diff --git a/ChangeLog b/ChangeLog
index 8f78477e9eee0fbcea173a3b0419a9476b4899ce..7eada1d4902fc7e85af500d3456452eba0f58cd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-16  Colin Watson  <cjwatson@ubuntu.com>
+
+       * configure.ac: Make error messages less confusing by testing for
+       -Wtrampolines rather than -Wno-trampolines (since -Wno-* is always
+       accepted, but produces a diagnostic if something else is wrong).
+
 2010-11-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/term/at_keyboard.c (grub_keyboard_controller_read)

diff --git a/configure.ac b/configure.ac
index 2b75883bcacd71801c756ec5e3caeafcb62ed7d7..c013c9022c7ed045b07cfbf2a7c7f65749a7d931 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -673,7 +673,10 @@ fi
 
 AC_CACHE_CHECK([whether -Wno-trampolines work], [grub_cv_cc_wnotrampolines], [
   SAVED_CFLAGS="$CFLAGS"
-  CFLAGS="$TARGET_CFLAGS -Wno-trampolines"
+  # Test for -Wtrampolines rather than -Wno-trampolines to reduce confusion
+  # in the event of later failures (since -Wno-* is always accepted, but
+  # produces a diagnostic if something else is wrong).
+  CFLAGS="$TARGET_CFLAGS -Wtrampolines"
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
 int va_arg_func (int fixed, va_list args);]], [[]])],
       [grub_cv_cc_wnotrampolines=yes],