From f6f07be763bf03cf8b56ed514cdea6f95f70f15a Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Thu, 3 Jul 2008 15:02:15 +0000
Subject: [PATCH] Changes to allow LOADABLE_LIBRARY to work for borland and MS
 compilers.

---
 configure/os/CONFIG.Common.UnixCommon                   | 4 +---
 configure/os/CONFIG.linux-x86-borland.linux-x86-borland | 2 +-
 configure/os/CONFIG.win32-x86-borland.win32-x86-borland | 4 ++--
 configure/os/CONFIG.win32-x86.win32-x86                 | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon
index a5733d40f..3f4a3fd4a 100644
--- a/configure/os/CONFIG.Common.UnixCommon
+++ b/configure/os/CONFIG.Common.UnixCommon
@@ -77,10 +77,8 @@ PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-L%)
 # Link definitions
 LINK.cpp = $(CCC) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
 LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
-LINK.shrlib = $(CCC) -o $@ $(SHRLIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
+LINK.shrlib = $(CCC) -o $@ $(TARGET_LIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
 LINK.shrlib += $(LIB_LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
-LINK.loadable_shrlib = $(CCC) -o $@ $(LOADABLE_SHRLIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
-LINK.loadable_shrlib += $(LIB_LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
 
 #--------------------------------------------------
 # Operating system definitions
diff --git a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland b/configure/os/CONFIG.linux-x86-borland.linux-x86-borland
index e1747e9fb..f8c5b28fb 100644
--- a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland
+++ b/configure/os/CONFIG.linux-x86-borland.linux-x86-borland
@@ -223,6 +223,6 @@ LINK.cpp += $(PROD_LDFLAGS) borinit.o /usr/lib/crt1.o $(PROD_LD_OBJS)
 LINK.cpp += , $@ ,,$(LINKLIBS) $(PROD_LDLIBS)
 
 LINK.shrlib = $(WINLINK) $(STATIC_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS) -Tpd -Gi
-LINK.shrlib+= $(LIB_LDFLAGS) borinitso.o $(LIBRARY_LD_OBJS) 
+LINK.shrlib+= $(TARGET_LIB_LDFLAGS) borinitso.o $(LIBRARY_LD_OBJS) 
 LINK.shrlib+= , $@ ,,$(LINKLIBS) $(SHRLIB_LDLIBS)
 
diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
index e3919474e..c63949adf 100644
--- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
+++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
@@ -13,8 +13,6 @@ VALID_BUILDS = Host Ioc
 
 #-------------------------------------------------------
 
-BUILD_LIBRARY += $(LOADABLE_BUILD_LIBRARY)
-
 BORLAND_INC = $(BORLAND)\\include
 BORLAND_LIB = $(BORLAND)\\lib
 BORLAND_BIN = $(BORLAND)\\bin
@@ -162,6 +160,7 @@ ARCH_DEP_CFLAGS=
 #	is: WIN32, sun4, hpux, linux, ...
 #
 OS_CLASS=WIN32
+POSIX=NO
 
 #	ifdef WIN32   looks better that  ifeq ($(OS_CLASS),WIN32)  ??
 WIN32=1
@@ -210,6 +209,7 @@ LINK.shrlib+= $(DLL_DEF_FLAG),$(LIBRARY_LD_RESS)
 #	on some archs), don't define (and build) any library!
 SHRLIB_SUFFIX=.dll
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
+LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 
 
 # When SHARED_LIBRARIES is YES we are building a DLL link library 
diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86
index c670dd1a3..e79986483 100644
--- a/configure/os/CONFIG.win32-x86.win32-x86
+++ b/configure/os/CONFIG.win32-x86.win32-x86
@@ -16,8 +16,6 @@ PATH_FILTER = $(subst /,\\,$(1))
 
 #-------------------------------------------------------
 
-BUILD_LIBRARY += $(LOADABLE_BUILD_LIBRARY)
-
 #
 # "\ " forces gnu make to keep this as one token
 #
@@ -171,6 +169,7 @@ SHRLIB_CFLAGS=
 #	is: WIN32, sun4, hpux, linux, ...
 #
 OS_CLASS=WIN32
+POSIX=NO
 
 #	ifdef WIN32   looks better that  ifeq ($(OS_CLASS),WIN32)  ??
 WIN32=1
@@ -226,6 +225,7 @@ MUNCH_CMD =  $(CCC) /Fo $@ $^
 #	on some archs), don't define (and build) any library!
 SHRLIB_SUFFIX=.dll
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
+LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 
 #
 # When SHARED_LIBRARIES is YES we are building a DLL link library