Bugzilla bug 112198: use the -dylib_file ld option to link the ssl3 and

smime3 dylibs and the NSS tools so that they can find the indirectly
referenced libsoftokn3.dylib.  Define and export DYLD_LIBRARY_PATH.  The
patch is contributed by Brian Ryner <bryner@netscape.com>. r=wtc,beard.
Modified Files:
	coreconf/Darwin.mk nss/cmd/platlibs.mk nss/lib/smime/config.mk
	nss/lib/ssl/config.mk nss/tests/common/init.sh

security/coreconf/Darwin.mk

@@ -62,7 +62,7 @@ OS_CFLAGS	= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fpascal-strings -traditional-
 ARCH		= darwin
 
 # May override this with -bundle to create a loadable module.
-DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1
+DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@)
 
 MKSHLIB		= $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
 DLL_SUFFIX	= dylib

security/nss/cmd/platlibs.mk

@@ -176,6 +176,10 @@ ifeq ($(OS_ARCH), Linux)
 EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
 endif
 
+ifeq ($(OS_ARCH), Darwin)
+EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
+endif
+
 # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
 # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
 EXTRA_SHARED_LIBS += \

security/nss/lib/smime/config.mk

@@ -59,6 +59,10 @@ EXTRA_SHARED_LIBS += \
 	-lnspr4 \
 	$(NULL)
 
+ifeq ($(OS_ARCH), Darwin)
+EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
+endif
+
 endif
 
 

security/nss/lib/ssl/config.mk

@@ -58,4 +58,9 @@ EXTRA_SHARED_LIBS += \
 	-lplds4 \
 	-lnspr4 \
 	$(NULL)
+
+ifeq ($(OS_ARCH), Darwin)
+EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
+endif
+
 endif

security/nss/tests/common/init.sh

@@ -172,6 +172,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
         LD_LIBRARY_PATH=${DIST}/${OBJDIR}/lib
         SHLIB_PATH=${DIST}/${OBJDIR}/lib
         LIBPATH=${DIST}/${OBJDIR}/lib
+        DYLD_LIBRARY_PATH=${DIST}/${OBJDIR}/lib
     fi
 
     if [ ! -d "${TESTDIR}" ]; then
@@ -388,7 +389,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
     TEMPFILES="${PWFILE} ${NOISE_FILE}"
     trap "Exit $0 Signal_caught" 2 3
 
-    export PATH LD_LIBRARY_PATH SHLIB_PATH LIBPATH
+    export PATH LD_LIBRARY_PATH SHLIB_PATH LIBPATH DYLD_LIBRARY_PATH
     export DOMSUF HOSTADDR
     export KILL SLEEP PS
     export MOZILLA_ROOT SECURITY_ROOT DIST TESTDIR OBJDIR HOSTDIR QADIR