X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_platform.m4;h=c4f2b2ad546334373831721fd25ec32c97d48828;hb=771170f522f2186b7fb0cde6052dbe37c1a9f1b7;hp=76ef66bc1ac05910083f93654df5ce3b12080c18;hpb=1b18496b3d1399d90cfba1975f23aee9c747445a;p=m6w6%2Flibmemcached

diff --git a/m4/pandora_platform.m4 b/m4/pandora_platform.m4
index 76ef66bc..c4f2b2ad 100644
--- a/m4/pandora_platform.m4
+++ b/m4/pandora_platform.m4
@@ -63,6 +63,15 @@ AC_DEFUN([PANDORA_PLATFORM],[
   AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
   AC_CHECK_DECL([__ICC], [INTELCC="yes"], [INTELCC="no"])
 
-  AS_IF([test "x$INTELCC" = "xyes"], [enable_rpath=no])
+  AS_IF([test "$INTELCC" = "yes"], [enable_rpath=no])
+ 
+  dnl By default, Sun Studio grabs special versions of limits.h and string.h
+  dnl when you use <cstring> and <climits>. By setting this define, we can
+  dnl disable that and cause those to wrap the standard headers instead.
+  dnl http://www.stlport.com/doc/configure.html
+  AS_IF([test "$SUNCC" = "yes"],[
+    AC_DEFINE([_STLP_NO_NEW_C_HEADERS],[1],
+      [Cause Sun Studio to not be quite so strict with standards conflicts])
+  ])
 
 ])