[goffice] Compilation: better clang support.

[Morten Welinder <mortenw src gnome org>]

commit 565df8f3362e97008c468a6228598207e1c21527
Author: Morten Welinder <terra gnome org>
Date:   Sun Feb 17 16:29:24 2013 -0500

    Compilation: better clang support.

 ChangeLog    |    4 ++++
 configure.ac |   33 ++++++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index aa5f74f..8edb59f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-17  Morten Welinder  <terra gnome org>
+
+       * configure.ac (set_more_warnings): Improve support for clang.
+
 2013-02-16  Morten Welinder  <terra gnome org>
 
        * goffice/math/go-regression.c (general_linear_regression): memset
diff --git a/configure.ac b/configure.ac
index 6b1b128..d8dd20f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,31 +409,42 @@ ifdef([GNOME_COMPILE_WARNINGS],
        []
 )
 set_more_warnings=yes
-if test "$GCC" = "yes" -a "x$set_more_warnings" != "xno"; then
-       warning_options="-Wsign-compare -Wpointer-arith -Wnested-externs \
+if test "$GCC" = yes -a "x$set_more_warnings" != xno; then
+       dnl Clang needs to option, or else it will appear to support any
+       dnl warning option
+       uwoption="-Werror=unknown-warning-option"
+       SAVE_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS $uwoption"
+       AC_MSG_CHECKING([whether gcc understands $uwoption])
+       AC_COMPILE_IFELSE(
+               [AC_LANG_PROGRAM([], [])],
+               [has_unknown_warning_option=yes],
+               [has_unknown_warning_option=no; uwoption=""])
+       AC_MSG_RESULT($has_unknown_warning_option)
+       CFLAGS="$SAVE_CFLAGS"
+
+       warning_options="-Wsign-compare -Wpointer-arith \
                         -Wchar-subscripts -Wwrite-strings \
                         -Wdeclaration-after-statement -Wnested-externs \
-                        -Wmissing-noreturn -Wmissing-prototypes \
+                        -Wmissing-noreturn \
                         -Werror=missing-prototypes -Werror=nested-externs \
                         -Werror=implicit-function-declaration \
                         -Wmissing-declarations -Wno-pointer-sign \
                         -Werror=format-security -Wbitwise -Wcast-to-as \
                         -Wdefault-bitfield-sign -Wdo-while -Wparen-string \
-                        -Wptr-subtraction-blows -Wreturn-void -Wtypesign"
-       if test $goffice_devel = yes; then
-               dnl Avoid triggering a warning in gtk+ headers for stable.
-               warning_options="$warning_options -Wstrict-prototypes"
-       fi
+                        -Wptr-subtraction-blows -Wreturn-void -Wtypesign \
+                        -Wstrict-prototypes"
        for option in $warning_options ; do
                SAVE_CFLAGS="$CFLAGS"
-               CFLAGS="$CFLAGS $option"
+               CFLAGS="$CFLAGS $uwoption $option"
                AC_MSG_CHECKING([whether gcc understands $option])
                AC_COMPILE_IFELSE(
                        [AC_LANG_PROGRAM([], [])],
                        [has_option=yes],
                        [has_option=no])
-               if test $has_option = no; then
-                 CFLAGS="$SAVE_CFLAGS"
+               CFLAGS="$SAVE_CFLAGS"
+               if test $has_option = yes; then
+                       CFLAGS="$CFLAGS $option"
                fi
                AC_MSG_RESULT($has_option)
                unset has_option