From e359f482373551f6c67b6efc356e1f97e45ebb09 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Mon, 10 Feb 2003 22:52:10 +0000
Subject: [PATCH] Allow <name>_LDFLAGS.

---
 configure/os/CONFIG.win32-x86-borland.win32-x86-borland | 2 +-
 configure/os/CONFIG.win32-x86.win32-x86                 | 2 +-
 configure/tools/makeMakefileInclude.pl                  | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
index dca01b187..f76c52dd2 100644
--- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
+++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
@@ -148,7 +148,7 @@ STATIC_LDLIBS_NO=
 # -w display warnings on
 LINK_OPT_FLAGS_YES = -c -C -Gi -Gn -Tpd -x -w
 LINK_OPT_FLAGS_NO = -c -C -Gi -Gn -Tpd -x -w-
-WIN32_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) $(LIB_LDFLAGS)
+WIN32_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
 OPT_LDFLAGS =
 
 ARCH_DEP_CFLAGS=
diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86
index 9bcbbd701..fd8a08faa 100644
--- a/configure/os/CONFIG.win32-x86.win32-x86
+++ b/configure/os/CONFIG.win32-x86.win32-x86
@@ -197,7 +197,7 @@ OP_SYS_LDLIBS =
 #		'-entry:_DllMainCRTStartup$(DLLENTRY)'
 DLLENTRY = @12
 
-WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) $(LIB_LDFLAGS)
+WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
 
 #
 # specify dll .def file only if it exists
diff --git a/configure/tools/makeMakefileInclude.pl b/configure/tools/makeMakefileInclude.pl
index 92ce63053..bbb3f66db 100755
--- a/configure/tools/makeMakefileInclude.pl
+++ b/configure/tools/makeMakefileInclude.pl
@@ -61,6 +61,13 @@ foreach $name ( @nameList ) {
 	print OUT "${name}_OBJS+=\$(${name}_OBJS_DEFAULT)\n";
 	print OUT "endif\n";
 	print OUT "endif\n";
+	print OUT "ifneq (\$(strip \$(${name}_LDFLAGS_\$(OS_CLASS))),)\n";
+	print OUT "${name}_LDFLAGS+=\$(subst -nil-,,\$(${name}_LDFLAGS_\$(OS_CLASS)))\n";
+	print OUT "else\n";
+	print OUT "ifdef ${name}_LDFLAGS_DEFAULT\n";
+	print OUT "${name}_LDFLAGS+=\$(${name}_LDFLAGS_DEFAULT)\n";
+	print OUT "endif\n";
+	print OUT "endif\n";
 	print OUT "ifneq (\$(strip \$(${name}_LDOBJS_\$(OS_CLASS))),)\n";
 	print OUT "${name}_LDOBJS+=\$(subst -nil-,,\$(${name}_LDOBJS_\$(OS_CLASS)))\n";
 	print OUT "else\n";