ENH: Merging changes from KWSys-IOS-bp to KWSys-IOS-b2t-1-mp to main tree. This introduces separate kwsys_ios and kwsys_stl macros needed to support all platforms.

1 files changed, 41 insertions, 34 deletions

diff --git a/Source/kwsys/Configure.hxx.in b/Source/kwsys/Configure.hxx.in
index bb506b4..21627bd 100644
--- a/Source/kwsys/Configure.hxx.in
+++ b/Source/kwsys/Configure.hxx.in
@@ -14,53 +14,60 @@
 #ifndef @KWSYS_NAMESPACE@_Configure_hxx
 #define @KWSYS_NAMESPACE@_Configure_hxx
 
-/* Defined if kwsys namespace is "kwsys".  */
-#if @KWSYS_NAME_IS_KWSYS@
-# define @KWSYS_NAMESPACE@_NAME_IS_KWSYS
-#endif
+/* Whether kwsys namespace is "kwsys".  */
+#define @KWSYS_NAMESPACE@_NAME_IS_KWSYS @KWSYS_NAME_IS_KWSYS@
 
-/* Defined if no ANSI C++ stream headers are present.  */
-#if @KWSYS_NO_ANSI_STREAM_HEADERS@
-# define @KWSYS_NAMESPACE@_NO_ANSI_STREAM_HEADERS
-#endif
+/* Whether ANSI C++ stream headers are to be used.  */
+#define @KWSYS_NAMESPACE@_IOS_HAVE_ANSI @KWSYS_IOS_HAVE_ANSI@
 
-/* Defined if no ANSI C++ <sstream> header is present.  */
-#if @KWSYS_NO_ANSI_STRING_STREAM@
-# define @KWSYS_NAMESPACE@_NO_ANSI_STRING_STREAM
-#endif
+/* Whether ANSI C++ streams are in std namespace.  */
+#define @KWSYS_NAMESPACE@_IOS_HAVE_STD @KWSYS_IOS_HAVE_STD@
 
-/* Defined if no std namespace is present.  */
-#if @KWSYS_NO_STD_NAMESPACE@
-# define @KWSYS_NAMESPACE@_NO_STD_NAMESPACE
-#endif
+/* Whether ANSI C++ <sstream> header is to be used.  */
+#define @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM @KWSYS_IOS_HAVE_SSTREAM@
+
+/* Whether old C++ <strstream.h> header is to be used.  */
+#define @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREAM_H @KWSYS_IOS_HAVE_STRSTREAM_H@
+
+/* Whether old C++ <strstrea.h> header is to be used.  */
+#define @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREA_H @KWSYS_IOS_HAVE_STRSTREA_H@
+
+/* Whether STL is in std namespace.  */
+#define @KWSYS_NAMESPACE@_STL_HAVE_STD @KWSYS_STL_HAVE_STD@
 
-/* Defined if std namespace is the GCC hack.  */
-#if defined(__GNUC__) && (__GNUC__ < 3)
-# define @KWSYS_NAMESPACE@_FAKE_STD_NAMESPACE
+/* Define the stl namespace macro.  */
+#if @KWSYS_NAMESPACE@_STL_HAVE_STD
+# define @KWSYS_NAMESPACE@_stl std
+#else
+# define @KWSYS_NAMESPACE@_stl
 #endif
 
-/* Define the std namespace macro.  */
-#if defined(@KWSYS_NAMESPACE@_NO_STD_NAMESPACE)
-# define @KWSYS_NAMESPACE@_std
+/* Define the ios namespace macro.  */
+#if @KWSYS_NAMESPACE@_IOS_HAVE_STD
+# define @KWSYS_NAMESPACE@_ios_namespace std
+#else
+# define @KWSYS_NAMESPACE@_ios_namespace
+#endif
+#if @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM
+# define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios_namespace
 #else
-# define @KWSYS_NAMESPACE@_std std
+# define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios
 #endif
 
 /* If building a C++ file in kwsys itself, give the source file
    access to the macros without a configured namespace.  */
 #if defined(KWSYS_NAMESPACE)
-# if !defined(@KWSYS_NAMESPACE@_NAME_IS_KWSYS)
-#  define kwsys_std @KWSYS_NAMESPACE@_std
-# endif
-# if defined(@KWSYS_NAMESPACE@_NO_STD_NAMESPACE)
-#  define KWSYS_NO_STD_NAMESPACE
-# endif
-# if defined(@KWSYS_NAMESPACE@_NO_ANSI_STREAM_HEADERS)
-#  define KWSYS_NO_ANSI_STREAM_HEADERS
-# endif
-# if defined(@KWSYS_NAMESPACE@_NO_ANSI_STRING_STREAM)
-#  define KWSYS_NO_ANSI_STRING_STREAM
+# if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
+#  define kwsys_stl @KWSYS_NAMESPACE@_stl
+#  define kwsys_ios @KWSYS_NAMESPACE@_ios
 # endif
+# define KWSYS_NAME_IS_KWSYS        @KWSYS_NAMESPACE@_NAME_IS_KWSYS
+# define KWSYS_IOS_HAVE_ANSI        @KWSYS_NAMESPACE@_IOS_HAVE_ANSI
+# define KWSYS_IOS_HAVE_STD         @KWSYS_NAMESPACE@_IOS_HAVE_STD
+# define KWSYS_IOS_HAVE_SSTREAM     @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM
+# define KWSYS_IOS_HAVE_STRSTREAM_H @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREAM_H
+# define KWSYS_IOS_HAVE_STRSTREA_H  @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREA_H
+# define KWSYS_STL_HAVE_STD         @KWSYS_NAMESPACE@_STL_HAVE_STD
 #endif
 
 #endif