From 389d61ba7caa8cb1e16d0c4bb0cb2a8df41327f6 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com"
 <wtc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 30 Aug 2003 00:24:15 +0000
Subject: [PATCH] Bugzilla bug 217504: 1. Do not use -lsvld on recent AIX
 releases. 2. Specify the standard AIX libpath, otherwise the directories we
 pass to the -L linker flags get added to the libpath.  3. Support building on
 AIX 5.2.  The patch is contributed by Philip K. Warren <pkw@us.ibm.com>.
 r=wtc. a=asa for checkin to Mozilla 1.5. Modified Files: AIX.mk AIX4.2.mk
 AIX4.3.mk AIX5.1.mk Added Files: AIX5.2.mk Tag: NSS_3_8_BRANCH

git-svn-id: svn://10.0.0.236/branches/NSS_3_8_BRANCH@146455 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/coreconf/AIX.mk    | 1 -
 mozilla/security/coreconf/AIX4.2.mk | 2 +-
 mozilla/security/coreconf/AIX4.3.mk | 4 ++--
 mozilla/security/coreconf/AIX5.1.mk | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mozilla/security/coreconf/AIX.mk b/mozilla/security/coreconf/AIX.mk
index 4e9429c1a84..365cb62c820 100644
--- a/mozilla/security/coreconf/AIX.mk
+++ b/mozilla/security/coreconf/AIX.mk
@@ -71,7 +71,6 @@ endif
 
 AIX_WRAP	= $(DIST)/lib/aixwrap.o
 AIX_TMP		= $(OBJDIR)/_aix_tmp.o
-OS_LIBS		+= -lsvld
 ifdef MAPFILE
 EXPORT_RULES = -bexport:$(MAPFILE)
 endif
diff --git a/mozilla/security/coreconf/AIX4.2.mk b/mozilla/security/coreconf/AIX4.2.mk
index 71280fdf78c..6975116b46b 100644
--- a/mozilla/security/coreconf/AIX4.2.mk
+++ b/mozilla/security/coreconf/AIX4.2.mk
@@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/AIX.mk
 
 OS_CFLAGS	+= -DAIX4_2
 DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -lsvld -L/usr/lpp/xlC/lib -lc -lm
+MKSHLIB		= $(LD) $(DSO_LDOPTS) -L/usr/lpp/xlC/lib -lc -lm
 
 OS_LIBS		+= -L/usr/lpp/xlC/lib -lc -lm
 ifdef MAPFILE
diff --git a/mozilla/security/coreconf/AIX4.3.mk b/mozilla/security/coreconf/AIX4.3.mk
index 43ce77bc073..c3788c15d8a 100644
--- a/mozilla/security/coreconf/AIX4.3.mk
+++ b/mozilla/security/coreconf/AIX4.3.mk
@@ -45,9 +45,9 @@ ifeq ($(USE_64), 1)
 endif
 OS_CFLAGS	+= -DAIX4_3
 DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -lsvld -L/usr/lpp/xlC/lib -lc -lm
+MKSHLIB		= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
 
-OS_LIBS		+= -L/usr/lpp/xlC/lib -lc -lm
+OS_LIBS		+= -blibpath:/usr/lib:/lib -lc -lm
 ifdef MAPFILE
 DSO_LDOPTS      += -bexport:$(MAPFILE)
 else
diff --git a/mozilla/security/coreconf/AIX5.1.mk b/mozilla/security/coreconf/AIX5.1.mk
index daa999ba7d8..1d88c32e5c3 100644
--- a/mozilla/security/coreconf/AIX5.1.mk
+++ b/mozilla/security/coreconf/AIX5.1.mk
@@ -44,9 +44,9 @@ ifeq ($(USE_64), 1)
 	export OBJECT_MODE
 endif
 DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -lsvld -L/usr/lpp/xlC/lib -lc -lm
+MKSHLIB		= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
 
-OS_LIBS		+= -L/usr/lpp/xlC/lib -lc -lm
+OS_LIBS		+= -blibpath:/usr/lib:/lib -lc -lm
 ifdef MAPFILE
 DSO_LDOPTS      += -bexport:$(MAPFILE)
 else