diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-05-04 04:40:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-05-04 04:40:15 +0200 |
| commit | d1864597a0d87fa9b3fbd09fc022b3405be7f274 (patch) | |
| tree | b9849aa63e5bb3b15e945bfda04ab2c0751b3453 | |
| parent | 8fadd8b8406335f1a2035f1a6aeab67c7fc5d685 (diff) | |
| download | vim-git-d1864597a0d87fa9b3fbd09fc022b3405be7f274.tar.gz | |
updated for version 7.3.923v7.3.923
Problem: Check for X11 header files fails on Solaris.
Solution: Only use -Werror for gcc. (Laurent Blume)
| -rwxr-xr-x | src/auto/configure | 6 | ||||
| -rw-r--r-- | src/configure.in | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index 38539ad38..f5fc87f30 100755 --- 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> diff --git a/src/configure.in b/src/configure.in index d4cd310b6..310dea4fc 100644 --- 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" diff --git a/src/version.c b/src/version.c index 8d16217ad..4fb40d0c0 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 923, +/**/ 922, /**/ 921, |