3 files changed, 23 insertions, 3 deletions
diff --git a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
index 91af9b8e8..21762d33f 100644
--- a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
+++ b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
@@ -55,7 +55,7 @@ PLATFORM_ENDIF
 
 <environment
         variable="CPPFLAGS"
-        value="-I/usr/local/lib/bcfg2/include"
+        value="-I/usr/local/lib/bcfg2/include/openssl -I/usr/local/lib/bcfg2/include"
         type="set"
 />
 
@@ -67,7 +67,9 @@ url="http://encapsrcdist/mirror/m2crypto/m2crypto-0.17.tar.gz
 
 <configure>
 /usr/local/lib/bcfg2/bin/python setup.py build_ext \
+--openssl=/usr/local/lib/bcfg2 \
 -I/usr/local/lib/bcfg2/include/openssl \
+-I/usr/local/lib/bcfg2/include \
 -L/usr/local/lib/bcfg2/lib/
 </configure>
 
diff --git a/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep b/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep
index 7a90ce095..484258849 100644
--- a/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep
+++ b/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep
@@ -18,6 +18,12 @@
 />
 
 <environment
+        variable="CXX"
+        value="g++ -static-libgcc"
+        type="set"
+/>
+
+<environment
         variable="PATH"
 PLATFORM_IF_MATCH(solaris)
         value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:"
@@ -41,7 +47,7 @@ PLATFORM_ENDIF
 PLATFORM_IF_MATCH(linux)
         value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib:/lib"
 PLATFORM_ELSE_IF_MATCH(aix)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib -Wl,-brtl"
 PLATFORM_ELSE_IF_MATCH(solaris)
         value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
 PLATFORM_ELSE
@@ -51,7 +57,13 @@ PLATFORM_ENDIF
 
 <environment
         variable="CPPFLAGS"
-        value="-I/usr/local/lib/bcfg2/include"
+        value="-I/usr/local/lib/bcfg2/include/openssl -I/usr/local/lib/bcfg2/include"
+        type="set"
+/>
+
+<environment
+        variable="CXXFLAGS"
+        value="-Wl,-bstatic -lstdc++ -Wl,-bdynamic -lsupc++"
         type="set"
 />
 
diff --git a/encap/src/encap-profiles/runit-1.7.2.ep b/encap/src/encap-profiles/runit-1.7.2.ep
index 4330dd1c5..ea452c4a9 100644
--- a/encap/src/encap-profiles/runit-1.7.2.ep
+++ b/encap/src/encap-profiles/runit-1.7.2.ep
@@ -25,6 +25,12 @@ PLATFORM_ENDIF
         type="prepend"
 />
 
+<environment
+        variable="CPPFLAGS"
+        value="-I/usr/local/lib"
+        type="set"
+/>
+
 PLATFORM_IF_MATCH(linux)
 PLATFORM_ELSE
 <environment