From 8a1987ea9e830563cba32a6f34d47699aea99735 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Thu, 28 Oct 2004 18:19:48 +0000
Subject: [PATCH] Implemented LOADABLE_SHRLIB_VERSION.

---
 configure/RULES_BUILD                  | 6 +++++-
 configure/os/CONFIG.Common.UnixCommon  | 2 +-
 configure/os/CONFIG.Common.hpux-parisc | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index cbe5f07e5..737eaf30a 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -330,7 +330,7 @@ $(INSTALL_LIB)/%.lib: %.lib
 $(INSTALL_SHRLIB)/lib%: lib%
 	@echo "Installing shared library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
-ifdef SHRLIB_VERSION
+ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst .$(SHRLIB_VERSION),,$@)
 	ln -s $< $(subst .$(SHRLIB_VERSION),,$@)
 endif # SHRLIB_VERSION
@@ -348,6 +348,10 @@ endif
 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	@echo "Installing loadable shared library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
+ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
+	@$(RM) $(subst .$(LOADABLE_SHRLIB_VERSION),,$@)
+	ln -s $< $(subst .$(LOADABLE_SHRLIB_VERSION),,$@)
+endif # LOADABLE_SHRLIB_VERSION
 
 $(INSTALL_CONFIG)/%: %
 	@echo "Installing config file $@"
diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon
index 4211c66ca..c1c9acf5d 100644
--- a/configure/os/CONFIG.Common.UnixCommon
+++ b/configure/os/CONFIG.Common.UnixCommon
@@ -29,7 +29,7 @@ OBJ = .o
 LIB_PREFIX = lib
 LIB_SUFFIX = .a
 SHRLIB_SUFFIX = .so$(addprefix .,$(SHRLIB_VERSION))
-LOADABLE_SHRLIB_SUFFIX = .so
+LOADABLE_SHRLIB_SUFFIX = .so$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
 LOADABLE_SHRLIB_PREFIX = lib
 
 #-------------------------------------------------------
diff --git a/configure/os/CONFIG.Common.hpux-parisc b/configure/os/CONFIG.Common.hpux-parisc
index cf5c09cf5..9986025f5 100644
--- a/configure/os/CONFIG.Common.hpux-parisc
+++ b/configure/os/CONFIG.Common.hpux-parisc
@@ -21,7 +21,7 @@ OP_SYS_CFLAGS = -D_HPUX_SOURCE
 OP_SYS_CXXFLAGS =
 
 SHRLIB_SUFFIX = .sl$(addprefix .,$(SHRLIB_VERSION))
-LOADABLE_SHRLIB_SUFFIX = .sl
+LOADABLE_SHRLIB_SUFFIX = .sl$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
 
 # Set runtime path for shared libraries
 empty:=                                      # trick from the make docs...