Mercurial > vim
changeset 4348:6ecb80dc6521 v7.3.923
updated for version 7.3.923
Problem: Check for X11 header files fails on Solaris.
Solution: Only use -Werror for gcc. (Laurent Blume)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sat, 04 May 2013 04:40:15 +0200 |
| parents | 3f3b20f8c188 |
| children | 9e3cdd762964 |
| files | src/auto/configure src/configure.in src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -7656,7 +7656,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if X11 header files implicitly declare return values" >&5 $as_echo_n "checking if X11 header files implicitly declare return values... " >&6; } cflags_save=$CFLAGS - CFLAGS="$CFLAGS $X_CFLAGS -Werror" + if test "$GCC" = yes; then + CFLAGS="$CFLAGS $X_CFLAGS -Werror" + else + CFLAGS="$CFLAGS $X_CFLAGS" + fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <X11/Xlib.h>
--- a/src/configure.in +++ b/src/configure.in @@ -1751,7 +1751,12 @@ else dnl Check that the X11 header files don't use implicit declarations AC_MSG_CHECKING(if X11 header files implicitly declare return values) cflags_save=$CFLAGS - CFLAGS="$CFLAGS $X_CFLAGS -Werror" + dnl -Werror is GCC only, others like Solaris Studio might not like it + if test "$GCC" = yes; then + CFLAGS="$CFLAGS $X_CFLAGS -Werror" + else + CFLAGS="$CFLAGS $X_CFLAGS" + fi AC_TRY_COMPILE([#include <X11/Xlib.h>], , AC_MSG_RESULT(no), CFLAGS="$CFLAGS -Wno-implicit-int"