[389-commits] Branch 'Directory_Server_8_2_Branch' - ldap/admin ltmain.sh Makefile.am Makefile.in wrappers/migratecred.in wrappers/mmldif.in wrappers/pwdhash.in

[Richard Allen Megginson]

 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(-)

New commits:
commit 3d27198f45b4b25df667d3f86dce66a44f4bc65d
Author: Rich Megginson <rmeggins(a)redhat.com&gt;
Date:   Thu Feb 25 11:10:53 2010 -0700

    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: Directory_Server_8_2_Branch
    Fix Description: Add pcre_libdir to script wrappers for programs that use pcre
    Platforms tested: RHEL5 x86_64
    Flag Day: no
    Doc impact: no

diff --git a/Makefile.am b/Makefile.am
index 15645e5..98c6544 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1246,6 +1246,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' \
@@ -1298,6 +1299,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
old mode 100755
new mode 100644
index 6b4464f..4a10ac0
--- a/Makefile.in
+++ b/Makefile.in
@@ -2210,6 +2210,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' \
@@ -2272,6 +2273,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 fb9bfdb..46c48d7 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/ltmain.sh b/ltmain.sh
old mode 100755
new mode 100644
diff --git a/wrappers/migratecred.in b/wrappers/migratecred.in
index c1aeabf..dd44800 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 3a89ce4..a11932e 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 ab84914..b3ef3fa 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