From b02bcae56632d2744ec24db2a1fd3a35ab363fba Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sun, 8 Dec 2013 15:21:08 +0100
Subject: [PATCH] Attempt to fix OpenIndiana build issue introduced by #19922

---
 configure    | 12 +++++++++---
 configure.ac | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 6bcc4b5b3e2..101dd4462f1 100755
--- a/configure
+++ b/configure
@@ -3447,12 +3447,18 @@ fi
 
 # On HP-UX mbstate_t requires _INCLUDE__STDC_A1_SOURCE
 case $ac_sys_system in
-hp*|HP*)
+  hp*|HP*)
+    define_stdc_a1=yes;;
+  *)
+    define_stdc_a1=no;;
+esac
+
+if test $define_stdc_a1 = yes
+then
 
 $as_echo "#define _INCLUDE__STDC_A1_SOURCE 1" >>confdefs.h
 
-  ;;
-esac
+fi
 
 #
 # SGI compilers allow the specification of the both the ABI and the
diff --git a/configure.ac b/configure.ac
index 2d701b1e621..25e1dc88d5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -524,11 +524,17 @@ fi
 
 # On HP-UX mbstate_t requires _INCLUDE__STDC_A1_SOURCE
 case $ac_sys_system in
-hp*|HP*)
-  AC_DEFINE(_INCLUDE__STDC_A1_SOURCE, 1, Define to include mbstate_t for mbrtowc)
-  ;;
+  hp*|HP*)
+    define_stdc_a1=yes;;
+  *)
+    define_stdc_a1=no;;
 esac
 
+if test $define_stdc_a1 = yes
+then
+  AC_DEFINE(_INCLUDE__STDC_A1_SOURCE, 1, Define to include mbstate_t for mbrtowc)
+fi
+
 #
 # SGI compilers allow the specification of the both the ABI and the
 # ISA on the command line.  Depending on the values of these switches,