updated for version 7.3.923

Problem:    Check for X11 header files fails on Solaris.
Solution:   Only use -Werror for gcc. (Laurent Blume)

diff --git a/src/auto/configure b/src/auto/configure
index 38539ad38846b12e327a1e3b0ec551174aa95614..f5fc87f30c0430c547a14f30c8ff58fdd3a4089e 100755 (executable)
--- 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 d4cd310b67f9c27d91dcfed08ae3a2e721a3b5a3..310dea4fcbd638e6a7580609de81eb42f6e8685c 100644 (file)
--- 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 8d16217ad1d01475ab687db14efca01d55f5756d..4fb40d0c030ce5954e37de68c36e1c05948631da 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    923,
 /**/
     922,
 /**/