From 00d0f2dfce8391ffa410ed81e934544a7923f370 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Thu, 10 Jul 2008 19:45:02 +0000
Subject: [PATCH] Added code to use stLport library instead of default Cstd
 library.

---
 configure/os/CONFIG.Common.solaris-sparc     | 18 +++++++++++++++---
 configure/os/CONFIG.Common.solaris-sparc-gnu |  8 ++++----
 configure/os/CONFIG.Common.solaris-x86       | 18 +++++++++++++++---
 configure/os/CONFIG.Common.solaris-x86-gnu   |  6 +++---
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/configure/os/CONFIG.Common.solaris-sparc b/configure/os/CONFIG.Common.solaris-sparc
index 7dc50cc19..6359cf739 100644
--- a/configure/os/CONFIG.Common.solaris-sparc
+++ b/configure/os/CONFIG.Common.solaris-sparc
@@ -39,11 +39,23 @@ RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
 GNU_TARGET=sparc-sun-solaris2
 
+STLPORT_CFLAGS_YES= -library=stlport4
+STLPORT_CFLAGS_NO=
+STLPORT_LDLIBS_YES =
+STLPORT_LDLIBS_NO = -lCstd
+
+# can be overridden in CONFIG_SITE.Common.solaris-sparc
+USE_STLPORT=NO
+
+OP_SYS_CFLAGS+=$(STLPORT_CFLAGS_$(USE_STLPORT))
+OP_SYS_LDFLAGS+=$(STLPORT_CFLAGS_$(USE_STLPORT))
+
 OP_SYS_LDLIBS += -lsocket -lnsl
-OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
-OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
-OP_SYS_LDLIBS_10 += -lCrun -lc -lCstd
+OP_SYS_LDLIBS_8 += -lCrun -lc
+OP_SYS_LDLIBS_9 += -lCrun -lc
+OP_SYS_LDLIBS_10 += -lCrun -lc
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
+OP_SYS_LDLIBS += $(STLPORT_LDLIBS_$(USE_STLPORT))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
 READLINE_DIR = $(GNU_DIR)
diff --git a/configure/os/CONFIG.Common.solaris-sparc-gnu b/configure/os/CONFIG.Common.solaris-sparc-gnu
index 38bf31476..2ae326e88 100644
--- a/configure/os/CONFIG.Common.solaris-sparc-gnu
+++ b/configure/os/CONFIG.Common.solaris-sparc-gnu
@@ -13,9 +13,9 @@ include $(CONFIG)/os/CONFIG.Common.solaris-sparc
 
 COMPILER_CPPFLAGS =  -D_REENTRANT
 
-OP_SYS_LDLIBS_8 = -lc
-OP_SYS_LDLIBS_9 = -lc
+STLPORT_LDLIBS_NO =
 
-RUNTIME_LDFLAGS += -R$(GNU_LIB)
-OP_SYS_LDFLAGS += -L$(GNU_LIB)
+OP_SYS_LDLIBS_8 =
+OP_SYS_LDLIBS_9 =
+OP_SYS_LDLIBS_10 =
 
diff --git a/configure/os/CONFIG.Common.solaris-x86 b/configure/os/CONFIG.Common.solaris-x86
index 10f2d5266..76c8738b2 100644
--- a/configure/os/CONFIG.Common.solaris-x86
+++ b/configure/os/CONFIG.Common.solaris-x86
@@ -40,11 +40,23 @@ RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
 GNU_TARGET=x86-sun-solaris2
 
+STLPORT_CFLAGS_YES= -library=stlport4
+STLPORT_CFLAGS_NO=
+STLPORT_LDLIBS_YES =
+STLPORT_LDLIBS_NO = -lCstd
+
+# can be overridden from ...SITE
+USE_STLPORT=NO
+
+OP_SYS_CFLAGS+=$(STLPORT_CFLAGS_$(USE_STLPORT))
+OP_SYS_LDFLAGS+=$(STLPORT_CFLAGS_$(USE_STLPORT))
+
 OP_SYS_LDLIBS += -lsocket -lnsl
-OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
-OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
-OP_SYS_LDLIBS_10 += -lCrun -lc -lCstd
+OP_SYS_LDLIBS_8 += -lCrun -lc
+OP_SYS_LDLIBS_9 += -lCrun -lc
+OP_SYS_LDLIBS_10 += -lCrun -lc
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
+OP_SYS_LDLIBS += $(STLPORT_LDLIBS_$(USE_STLPORT))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
 READLINE_DIR = $(GNU_DIR)
diff --git a/configure/os/CONFIG.Common.solaris-x86-gnu b/configure/os/CONFIG.Common.solaris-x86-gnu
index 2b67020a7..77215f687 100644
--- a/configure/os/CONFIG.Common.solaris-x86-gnu
+++ b/configure/os/CONFIG.Common.solaris-x86-gnu
@@ -12,9 +12,9 @@ include $(CONFIG)/os/CONFIG.Common.solaris-x86
 
 COMPILER_CPPFLAGS = -D_REENTRANT
 
+STLPORT_LDLIBS_NO =
+
 OP_SYS_LDLIBS_8 = -lc
 OP_SYS_LDLIBS_9 = -lc
-
-RUNTIME_LDFLAGS += -R$(GNU_LIB)
-OP_SYS_LDFLAGS += -L$(GNU_LIB)
+OP_SYS_LDLIBS_10 = -lc