equal
deleted
inserted
replaced
5 References: |
5 References: |
6 |
6 |
7 diff --git a/configure.in b/configure.in |
7 diff --git a/configure.in b/configure.in |
8 --- a/configure.in |
8 --- a/configure.in |
9 +++ b/configure.in |
9 +++ b/configure.in |
10 @@ -8231,16 +8231,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
10 @@ -8193,16 +8193,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
11 MOZ_ENABLE_SKIA_GPU=1 |
11 MOZ_ENABLE_SKIA_GPU=1 |
12 AC_DEFINE(USE_SKIA_GPU) |
12 AC_DEFINE(USE_SKIA_GPU) |
13 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
13 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
14 fi |
14 fi |
15 fi |
15 fi |
77 #include "NSSCertDBTrustDomain.h" |
77 #include "NSSCertDBTrustDomain.h" |
78 #include "mozilla/Telemetry.h" |
78 #include "mozilla/Telemetry.h" |
79 #include "nsCertVerificationThread.h" |
79 #include "nsCertVerificationThread.h" |
80 #include "nsAppDirectoryServiceDefs.h" |
80 #include "nsAppDirectoryServiceDefs.h" |
81 #include "nsComponentManagerUtils.h" |
81 #include "nsComponentManagerUtils.h" |
82 @@ -1141,17 +1148,31 @@ nsNSSComponent::InitializeNSS() |
82 @@ -1115,17 +1122,31 @@ nsNSSComponent::InitializeNSS() |
83 if (NS_FAILED(rv)) { |
83 if (NS_FAILED(rv)) { |
84 nsPSMInitPanic::SetPanic(); |
84 nsPSMInitPanic::SetPanic(); |
85 return NS_ERROR_NOT_AVAILABLE; |
85 return NS_ERROR_NOT_AVAILABLE; |
86 } |
86 } |
87 |
87 |
113 PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); |
113 PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); |
114 } |
114 } |
115 diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk |
115 diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk |
116 --- a/toolkit/library/libxul.mk |
116 --- a/toolkit/library/libxul.mk |
117 +++ b/toolkit/library/libxul.mk |
117 +++ b/toolkit/library/libxul.mk |
118 @@ -146,17 +146,17 @@ OS_LIBS += $(call EXPAND_LIBNAME,mfuuid |
118 @@ -145,17 +145,17 @@ endif |
|
119 ifdef MOZ_WMF |
|
120 OS_LIBS += $(call EXPAND_LIBNAME,mfuuid wmcodecdspuuid strmiids) |
119 endif |
121 endif |
120 |
122 |
121 ifdef MOZ_DIRECTSHOW |
123 ifdef MOZ_DIRECTSHOW |
122 OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo) |
124 OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo) |
123 endif |
125 endif |
124 |
|
125 EXTRA_DSO_LDOPTS += $(LIBS_DIR) |
|
126 |
126 |
127 -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) |
127 -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) |
128 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) |
128 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) |
129 |
129 |
130 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
130 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |