From 744b6ea932fdf7a9a321abbdc8d9bc71e9d8f3e5 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Wed, 4 Oct 2006 11:29:09 +0000
Subject: EncapPackages: Add library search path to GNU/Linux to make it
 consistent with AIX and Solaris

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2381 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/bcfg2-0.8.4.ep                      | 2 +-
 encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep             | 2 +-
 encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep                | 2 +-
 encap/src/encap-profiles/bcfg2-glib-2.8.6.ep                 | 2 +-
 encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep                | 2 +-
 encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep             | 2 +-
 encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep             | 2 +-
 encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep                 | 2 +-
 encap/src/encap-profiles/bcfg2-openssl-0.9.8c.ep             | 2 +-
 encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep            | 2 +-
 encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep              | 2 +-
 encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep              | 2 +-
 encap/src/encap-profiles/bcfg2-python-2.4.3.ep               | 2 +-
 encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep          | 2 +-
 encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep | 2 +-
 encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep          | 2 +-
 encap/src/encap-profiles/bcfg2-readline-5.1.ep               | 2 +-
 encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep                 | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'encap/src')

diff --git a/encap/src/encap-profiles/bcfg2-0.8.4.ep b/encap/src/encap-profiles/bcfg2-0.8.4.ep
index 49b9fc453..0c646a853 100644
--- a/encap/src/encap-profiles/bcfg2-0.8.4.ep
+++ b/encap/src/encap-profiles/bcfg2-0.8.4.ep
@@ -51,7 +51,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
index a08fab91e..a0eb396ac 100644
--- a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
+++ b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
@@ -38,7 +38,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep b/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep
index 699ba2bab..3de54abcd 100644
--- a/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep
+++ b/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep
@@ -40,7 +40,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep b/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep
index 1e57bd6f5..f0ee92c23 100644
--- a/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep
+++ b/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep
@@ -42,7 +42,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep b/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep
index 4f87c501b..4ee4fae19 100644
--- a/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep
+++ b/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep
@@ -39,7 +39,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep b/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep
index 214f5819f..548896942 100644
--- a/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep
+++ b/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep
@@ -40,7 +40,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep b/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep
index ea0b810df..c95c8e9b5 100644
--- a/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep
+++ b/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep
@@ -41,7 +41,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep b/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep
index 1ea4f0a35..becf9d6bd 100644
--- a/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep
+++ b/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep
@@ -43,7 +43,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -lexslt -L/usr/local/lib/bcfg2/lib/python2.4/site-packages -Wl,-rpath,/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib/python2.4/site-packages"
+        value="-L/usr/local/lib/bcfg2/lib -lexslt -L/usr/local/lib/bcfg2/lib/python2.4/site-packages -Wl,-rpath,/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib/python2.4/site-packages -YP,/usr/local/lib/bcfg2/lib:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/usr/lib:/lib"
 PLATFORM_ELSE_IF_MATCH(aix)
         value="-L/usr/local/lib/bcfg2/lib -lexslt -L/usr/local/lib/bcfg2/lib/python2.4/site-packages -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/usr/lib"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-openssl-0.9.8c.ep b/encap/src/encap-profiles/bcfg2-openssl-0.9.8c.ep
index 33bc36578..60eed6819 100644
--- a/encap/src/encap-profiles/bcfg2-openssl-0.9.8c.ep
+++ b/encap/src/encap-profiles/bcfg2-openssl-0.9.8c.ep
@@ -39,7 +39,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep b/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep
index eb6ac4b55..f2f3dd3aa 100644
--- a/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep
+++ b/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep
@@ -37,7 +37,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
index 79fd79aae..6878d20dc 100644
--- a/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
+++ b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
@@ -41,7 +41,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep b/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep
index c69ca322a..707c39106 100644
--- a/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep
+++ b/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep
@@ -38,7 +38,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-python-2.4.3.ep b/encap/src/encap-profiles/bcfg2-python-2.4.3.ep
index e6d5f76ea..636275325 100644
--- a/encap/src/encap-profiles/bcfg2-python-2.4.3.ep
+++ b/encap/src/encap-profiles/bcfg2-python-2.4.3.ep
@@ -42,7 +42,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
index a07bf6c70..1b4ec2b72 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
@@ -38,7 +38,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
index ad586191d..7e40f3439 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
@@ -38,7 +38,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
index 7af5902e5..e927188a9 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
@@ -38,7 +38,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-readline-5.1.ep b/encap/src/encap-profiles/bcfg2-readline-5.1.ep
index 2a321ca38..a5dd55cbd 100644
--- a/encap/src/encap-profiles/bcfg2-readline-5.1.ep
+++ b/encap/src/encap-profiles/bcfg2-readline-5.1.ep
@@ -38,7 +38,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
diff --git a/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep b/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
index 882e33c65..240fd7146 100644
--- a/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
+++ b/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
@@ -37,7 +37,7 @@ PLATFORM_ENDIF
 <environment
         variable="LDFLAGS"
 PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+        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"
 PLATFORM_ELSE_IF_MATCH(solaris)
-- 
cgit v1.2.3-1-g7c22