To: vim_dev@googlegroups.com Subject: Patch 7.3.923 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.3.923 Problem: Check for X11 header files fails on Solaris. Solution: Only use -Werror for gcc. (Laurent Blume) Files: src/configure.in, src/auto/configure *** ../vim-7.3.922/src/configure.in 2013-04-15 14:44:53.000000000 +0200 --- src/configure.in 2013-05-04 04:34:46.000000000 +0200 *************** *** 1751,1757 **** 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" AC_TRY_COMPILE([#include ], , AC_MSG_RESULT(no), CFLAGS="$CFLAGS -Wno-implicit-int" --- 1751,1762 ---- 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 ! 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 ], , AC_MSG_RESULT(no), CFLAGS="$CFLAGS -Wno-implicit-int" *** ../vim-7.3.922/src/auto/configure 2013-04-15 14:44:53.000000000 +0200 --- src/auto/configure 2013-05-04 04:34:50.000000000 +0200 *************** *** 7656,7662 **** { $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" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include --- 7656,7666 ---- { $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 ! 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 *** ../vim-7.3.922/src/version.c 2013-05-04 04:11:01.000000000 +0200 --- src/version.c 2013-05-04 04:39:13.000000000 +0200 *************** *** 730,731 **** --- 730,733 ---- { /* Add new patch number below this line */ + /**/ + 923, /**/ -- GALAHAD: Camelot ... LAUNCELOT: Camelot ... GAWAIN: It's only a model. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///