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 38539ad..f5fc87f 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7656,7 +7656,11 @@
{ $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 d4cd310..310dea4 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1751,7 +1751,12 @@
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 8d16217..4fb40d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 923,
+/**/
922,
/**/
921,