From 436709cff22f812eebe7399894a1a5161583f203 Mon Sep 17 00:00:00 2001
From: Jesus Cea <jcea@jcea.es>
Date: Thu, 25 Nov 2010 17:05:57 +0000
Subject: [PATCH] Compile correctly under OpenIndiana (and possibly Solaris 11
 Express)

---
 configure    | 17 +++++++++--------
 configure.in |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 8a23f2bb32..b4823f99f6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 85351 .
+# From configure.in Revision: 86044 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 3.1.
 #
@@ -757,7 +757,8 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP'
+CPP
+CPPFLAGS'
 
 
 # Initialize some variables set by options.
@@ -1923,11 +1924,11 @@ else
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
-	     enum { N = $2 / 2 - 1 };
 int
 main ()
 {
-static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
+	     0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
 test_array [0] = 0
 
   ;
@@ -1938,11 +1939,11 @@ if ac_fn_c_try_compile "$LINENO"; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
-	        enum { N = $2 / 2 - 1 };
 int
 main ()
 {
-static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
+		($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
 		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
 test_array [0] = 0
 
@@ -3037,7 +3038,7 @@ then
   # Furthermore, on Solaris 10, XPG6 requires the use of a C99
   # compiler
   case $ac_sys_system/$ac_sys_release in
-    SunOS/5.8|SunOS/5.9|SunOS/5.10)
+    SunOS/5.8|SunOS/5.9|SunOS/5.10|SunOS/5.11)
 
 $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
 
@@ -3056,7 +3057,7 @@ $as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
   # except for Solaris 10, where it must not be defined,
   # as it implies XPG4.2
   case $ac_sys_system/$ac_sys_release in
-    SunOS/5.10)
+    SunOS/5.10|SunOS/5.11)
       ;;
     *)
 
diff --git a/configure.in b/configure.in
index 15105e71ba..0ec5e11063 100644
--- a/configure.in
+++ b/configure.in
@@ -353,7 +353,7 @@ then
   # Furthermore, on Solaris 10, XPG6 requires the use of a C99
   # compiler
   case $ac_sys_system/$ac_sys_release in
-    SunOS/5.8|SunOS/5.9|SunOS/5.10)
+    SunOS/5.8|SunOS/5.9|SunOS/5.10|SunOS/5.11)
       AC_DEFINE(_XOPEN_SOURCE, 500, 
                 Define to the level of X/Open that your system supports)
       ;;
@@ -370,7 +370,7 @@ then
   # except for Solaris 10, where it must not be defined, 
   # as it implies XPG4.2
   case $ac_sys_system/$ac_sys_release in
-    SunOS/5.10)
+    SunOS/5.10|SunOS/5.11)
       ;;
     *)
       AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1,
-- 
2.40.0