From 1c13ce0ab7112f960ca877f400a360b365b6513c Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com" <seawood%netscape.com>
Date: Thu, 18 Apr 2002 21:50:31 +0000
Subject: [PATCH] Add LIBS_DIR to the link line before EXTRA_DSO_LIBS to avoid
 link-ordering issues on linkers that care (e.g,Sun Forte 7). Bug #137762
 r=dcran

---
 modules/libpr0n/decoders/bmp/Makefile.in  | 1 +
 modules/libpr0n/decoders/gif/Makefile.in  | 4 +++-
 modules/libpr0n/decoders/jpeg/Makefile.in | 4 +++-
 modules/libpr0n/decoders/mng/Makefile.in  | 4 +++-
 modules/libpr0n/decoders/png/Makefile.in  | 4 +++-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/libpr0n/decoders/bmp/Makefile.in b/modules/libpr0n/decoders/bmp/Makefile.in
index f0b412a09e2f..a0d6922263dc 100644
--- a/modules/libpr0n/decoders/bmp/Makefile.in
+++ b/modules/libpr0n/decoders/bmp/Makefile.in
@@ -45,6 +45,7 @@ REQUIRES	= xpcom \
 CPPSRCS        = nsBMPDecoder.cpp nsICODecoder.cpp nsBMPModule.cpp
 
 EXTRA_DSO_LDOPTS = \
+		   $(LIBS_DIR) \
 		   $(EXTRA_DSO_LIBS) \
 		   $(MOZ_COMPONENT_LIBS) \
                    $(NULL)
diff --git a/modules/libpr0n/decoders/gif/Makefile.in b/modules/libpr0n/decoders/gif/Makefile.in
index 4f413e1ba423..15a675222ccd 100644
--- a/modules/libpr0n/decoders/gif/Makefile.in
+++ b/modules/libpr0n/decoders/gif/Makefile.in
@@ -42,7 +42,9 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= GIF2.cpp nsGIFDecoder2.cpp nsGIFModule.cpp
 
-EXTRA_DSO_LDOPTS = $(GIF_LIBS) \
+EXTRA_DSO_LDOPTS = \
+		$(LIBS_DIR) \
+		$(GIF_LIBS) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/modules/libpr0n/decoders/jpeg/Makefile.in b/modules/libpr0n/decoders/jpeg/Makefile.in
index 1d69c2230fae..ccb32e13444f 100644
--- a/modules/libpr0n/decoders/jpeg/Makefile.in
+++ b/modules/libpr0n/decoders/jpeg/Makefile.in
@@ -44,7 +44,9 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= nsJPEGDecoder.cpp nsJPEGFactory.cpp
 
-EXTRA_DSO_LDOPTS = $(JPEG_LIBS) \
+EXTRA_DSO_LDOPTS = \
+		$(LIBS_DIR) \
+		$(JPEG_LIBS) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/modules/libpr0n/decoders/mng/Makefile.in b/modules/libpr0n/decoders/mng/Makefile.in
index 4b9de7d7ddae..5376a90d3b13 100644
--- a/modules/libpr0n/decoders/mng/Makefile.in
+++ b/modules/libpr0n/decoders/mng/Makefile.in
@@ -44,7 +44,9 @@ REQUIRES	= string \
 
 CPPSRCS		= nsMNGDecoder.cpp nsMNGFactory.cpp imgContainerMNG.cpp
 
-EXTRA_DSO_LDOPTS = $(MNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) \
+EXTRA_DSO_LDOPTS = \
+		$(LIBS_DIR) \
+		$(MNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/modules/libpr0n/decoders/png/Makefile.in b/modules/libpr0n/decoders/png/Makefile.in
index f89bac500cb9..8c15603f19f5 100644
--- a/modules/libpr0n/decoders/png/Makefile.in
+++ b/modules/libpr0n/decoders/png/Makefile.in
@@ -44,7 +44,9 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= nsPNGDecoder.cpp nsPNGFactory.cpp
 
-EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS) \
+EXTRA_DSO_LDOPTS = \
+		$(LIBS_DIR) \
+		$(PNG_LIBS) $(ZLIB_LIBS) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)