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 @@ -8192,16 +8192,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
10 @@ -8199,16 +8199,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 |
49 LOCAL_INCLUDES += [ |
49 LOCAL_INCLUDES += [ |
50 '../../../certverifier', |
50 '../../../certverifier', |
51 '../../../pkix/include', |
51 '../../../pkix/include', |
52 ] |
52 ] |
53 |
53 |
54 +LOCAL_INCLUDES += CONFIG['NSSHELPER_CFLAGS'] |
54 +CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS']) |
55 +EXTRA_DSO_LDOPTS += CONFIG['NSSHELPER_LIBS'] |
55 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
56 + |
56 + |
57 if CONFIG['NSS_DISABLE_DBM']: |
57 if CONFIG['NSS_DISABLE_DBM']: |
58 DEFINES['NSS_DISABLE_DBM'] = '1' |
58 DEFINES['NSS_DISABLE_DBM'] = '1' |
59 |
59 |
60 DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True' |
60 DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True' |
87 #include "NSSCertDBTrustDomain.h" |
87 #include "NSSCertDBTrustDomain.h" |
88 #include "mozilla/Telemetry.h" |
88 #include "mozilla/Telemetry.h" |
89 #include "nsCertVerificationThread.h" |
89 #include "nsCertVerificationThread.h" |
90 #include "nsAppDirectoryServiceDefs.h" |
90 #include "nsAppDirectoryServiceDefs.h" |
91 #include "nsComponentManagerUtils.h" |
91 #include "nsComponentManagerUtils.h" |
92 @@ -944,17 +951,31 @@ nsNSSComponent::InitializeNSS() |
92 @@ -943,17 +950,31 @@ nsNSSComponent::InitializeNSS() |
93 if (NS_FAILED(rv)) { |
93 if (NS_FAILED(rv)) { |
94 nsPSMInitPanic::SetPanic(); |
94 nsPSMInitPanic::SetPanic(); |
95 return NS_ERROR_NOT_AVAILABLE; |
95 return NS_ERROR_NOT_AVAILABLE; |
96 } |
96 } |
97 |
97 |
132 'secur32.dll', |
132 'secur32.dll', |
133 'wininet.dll', |
133 'wininet.dll', |
134 'winspool.drv' |
134 'winspool.drv' |
135 ] |
135 ] |
136 |
136 |
137 +EXTRA_DSO_LDOPTS += CONFIG['NSSHELPER_LIBS'] |
137 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
138 + |
138 + |
139 if CONFIG['MOZ_METRO']: |
139 if CONFIG['MOZ_METRO']: |
140 DELAYLOAD_DLLS += [ |
140 DELAYLOAD_DLLS += [ |
141 'API-MS-WIN-CORE-WINRT-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL', |
141 'API-MS-WIN-CORE-WINRT-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL', |
142 'API-MS-WIN-CORE-WINRT-STRING-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL', |
142 'API-MS-WIN-CORE-WINRT-STRING-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL', |