From 9d02126770da84e2a48e9b3c0c36536131c4d71a Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Thu, 25 Feb 2010 11:10:53 -0700
Subject: Bug 568196 - Install DS8.2 on Solaris fails

https://bugzilla.redhat.com/show_bug.cgi?id=568196
Resolves: bug 568196
Bug Description: Install DS8.2 on Solaris fails
Reviewed by: nhosoi (Thanks!)
Branch: HEAD
Fix Description: Add pcre_libdir to script wrappers for programs that use pcre
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
(cherry picked from commit 3d27198f45b4b25df667d3f86dce66a44f4bc65d)
---
 Makefile.am                            | 2 ++
 Makefile.in                            | 2 ++
 ldap/admin/src/scripts/start-dirsrv.in | 4 ++--
 wrappers/migratecred.in                | 2 +-
 wrappers/mmldif.in                     | 2 +-
 wrappers/pwdhash.in                    | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7b903ae5..c3ec2f6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1291,6 +1291,7 @@ fixupcmd = sed \
 	-e 's,@sasl_libdir\@,$(libdir),g' \
 	-e 's,@sasl_path\@,$(libdir)/sasl2,g' \
 	-e 's,@netsnmp_libdir\@,$(libdir),g' \
+	-e 's,@pcre_libdir\@,$(libdir),g' \
 	-e 's,@propertydir\@,$(propertydir),g' \
 	-e 's,@datadir\@,$(datadir),g' \
 	-e 's,@schemadir\@,$(schemadir),g' \
@@ -1344,6 +1345,7 @@ fixupcmd = sed \
 	-e 's,@sasl_libdir\@,$(sasl_libdir),g' \
 	-e 's,@sasl_path\@,@sasl_path@,g' \
 	-e 's,@netsnmp_libdir\@,$(netsnmp_libdir),g' \
+	-e 's,@pcre_libdir\@,$(pcre_libdir),g' \
 	-e 's,@propertydir\@,$(propertydir),g' \
 	-e 's,@datadir\@,$(datadir),g' \
 	-e 's,@schemadir\@,$(schemadir),g' \
diff --git a/Makefile.in b/Makefile.in
index 0a8b5abb..bc4b1a61 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2270,6 +2270,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
 @BUNDLE_FALSE@	-e 's,@sasl_libdir\@,$(sasl_libdir),g' \
 @BUNDLE_FALSE@	-e 's,@sasl_path\@,@sasl_path@,g' \
 @BUNDLE_FALSE@	-e 's,@netsnmp_libdir\@,$(netsnmp_libdir),g' \
+@BUNDLE_FALSE@	-e 's,@pcre_libdir\@,$(pcre_libdir),g' \
 @BUNDLE_FALSE@	-e 's,@propertydir\@,$(propertydir),g' \
 @BUNDLE_FALSE@	-e 's,@datadir\@,$(datadir),g' \
 @BUNDLE_FALSE@	-e 's,@schemadir\@,$(schemadir),g' \
@@ -2333,6 +2334,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
 @BUNDLE_TRUE@	-e 's,@sasl_libdir\@,$(libdir),g' \
 @BUNDLE_TRUE@	-e 's,@sasl_path\@,$(libdir)/sasl2,g' \
 @BUNDLE_TRUE@	-e 's,@netsnmp_libdir\@,$(libdir),g' \
+@BUNDLE_TRUE@	-e 's,@pcre_libdir\@,$(libdir),g' \
 @BUNDLE_TRUE@	-e 's,@propertydir\@,$(propertydir),g' \
 @BUNDLE_TRUE@	-e 's,@datadir\@,$(datadir),g' \
 @BUNDLE_TRUE@	-e 's,@schemadir\@,$(schemadir),g' \
diff --git a/ldap/admin/src/scripts/start-dirsrv.in b/ldap/admin/src/scripts/start-dirsrv.in
index fb9bfdb0..46c48d71 100755
--- a/ldap/admin/src/scripts/start-dirsrv.in
+++ b/ldap/admin/src/scripts/start-dirsrv.in
@@ -22,9 +22,9 @@ start_instance() {
     fi
 
     prefix="$DS_ROOT"
-    LD_LIBRARY_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+    LD_LIBRARY_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:@pcre_libdir@
     export LD_LIBRARY_PATH
-    SHLIB_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+    SHLIB_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:@pcre_libdir@
     export SHLIB_PATH
 
     DS_CONFIG_DIR=$CONFIG_DIR
diff --git a/wrappers/migratecred.in b/wrappers/migratecred.in
index c1aeabf2..dd44800f 100755
--- a/wrappers/migratecred.in
+++ b/wrappers/migratecred.in
@@ -4,7 +4,7 @@
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@pcre_libdir@
 BIN_DIR=@bindir@
 COMMAND=migratecred-bin
 
diff --git a/wrappers/mmldif.in b/wrappers/mmldif.in
index 3a89ce4c..a11932e3 100755
--- a/wrappers/mmldif.in
+++ b/wrappers/mmldif.in
@@ -4,7 +4,7 @@
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@pcre_libdir@
 BIN_DIR=@bindir@
 COMMAND=mmldif-bin
 
diff --git a/wrappers/pwdhash.in b/wrappers/pwdhash.in
index ab84914b..b3ef3fa9 100755
--- a/wrappers/pwdhash.in
+++ b/wrappers/pwdhash.in
@@ -4,7 +4,7 @@
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@pcre_libdir@
 BIN_DIR=@bindir@
 COMMAND=pwdhash-bin
 
-- 
cgit