25 + |
25 + |
26 +if test "$MOZ_ENABLE_NSSHELPER"; then |
26 +if test "$MOZ_ENABLE_NSSHELPER"; then |
27 + AC_DEFINE(MOZ_ENABLE_NSSHELPER) |
27 + AC_DEFINE(MOZ_ENABLE_NSSHELPER) |
28 +fi |
28 +fi |
29 +AC_SUBST(MOZ_ENABLE_NSSHELPER) |
29 +AC_SUBST(MOZ_ENABLE_NSSHELPER) |
30 +AC_SUBST(NSSHELPER_CFLAGS) |
30 +AC_SUBST_LIST(NSSHELPER_CFLAGS) |
31 +AC_SUBST(NSSHELPER_LIBS) |
31 +AC_SUBST_LIST(NSSHELPER_LIBS) |
32 + |
32 + |
33 +dnl ======================================================== |
33 +dnl ======================================================== |
34 dnl disable xul |
34 dnl disable xul |
35 dnl ======================================================== |
35 dnl ======================================================== |
36 MOZ_ARG_DISABLE_BOOL(xul, |
36 MOZ_ARG_DISABLE_BOOL(xul, |
37 [ --disable-xul Disable XUL], |
37 [ --disable-xul Disable XUL], |
38 MOZ_XUL= ) |
38 MOZ_XUL= ) |
39 if test "$MOZ_XUL"; then |
39 if test "$MOZ_XUL"; then |
40 AC_DEFINE(MOZ_XUL) |
40 AC_DEFINE(MOZ_XUL) |
41 else |
41 else |
42 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
42 diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build |
43 new file mode 100644 |
43 --- a/security/manager/ssl/src/moz.build |
44 --- /dev/null |
44 +++ b/security/manager/ssl/src/moz.build |
45 +++ b/security/manager/ssl/src/Makefile.in |
45 @@ -91,16 +91,19 @@ FAIL_ON_WARNINGS = True |
46 @@ -0,0 +1,8 @@ |
46 |
47 +#! gmake |
47 FINAL_LIBRARY = 'xul' |
48 +# |
48 |
49 +# This Source Code Form is subject to the terms of the Mozilla Public |
49 LOCAL_INCLUDES += [ |
50 +# License, v. 2.0. If a copy of the MPL was not distributed with this |
50 '../../../certverifier', |
51 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. |
51 '../../../pkix/include', |
|
52 ] |
|
53 |
|
54 +LOCAL_INCLUDES += CONFIG['NSSHELPER_CFLAGS'] |
|
55 +EXTRA_DSO_LDOPTS += CONFIG['NSSHELPER_LIBS'] |
52 + |
56 + |
53 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) |
57 if CONFIG['NSS_DISABLE_DBM']: |
54 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
58 DEFINES['NSS_DISABLE_DBM'] = '1' |
|
59 |
|
60 DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True' |
|
61 DEFINES['NSS_ENABLE_ECC'] = 'True' |
|
62 for var in ('DLL_PREFIX', 'DLL_SUFFIX'): |
|
63 DEFINES[var] = '"%s"' % CONFIG[var] |
|
64 |
55 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
65 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
56 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
66 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
57 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
67 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
58 @@ -3,16 +3,23 @@ |
68 @@ -3,16 +3,23 @@ |
59 * This Source Code Form is subject to the terms of the Mozilla Public |
69 * This Source Code Form is subject to the terms of the Mozilla Public |
110 init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true); |
120 init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true); |
111 } |
121 } |
112 if (init_rv != SECSuccess) { |
122 if (init_rv != SECSuccess) { |
113 PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); |
123 PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); |
114 } |
124 } |
115 diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk |
125 diff --git a/toolkit/library/libxul.mozbuild b/toolkit/library/libxul.mozbuild |
116 --- a/toolkit/library/libxul.mk |
126 --- a/toolkit/library/libxul.mozbuild |
117 +++ b/toolkit/library/libxul.mk |
127 +++ b/toolkit/library/libxul.mozbuild |
118 @@ -32,16 +32,18 @@ endif |
128 @@ -22,16 +22,18 @@ DELAYLOAD_DLLS += [ |
119 ifeq (Linux,$(OS_ARCH)) |
129 'psapi.dll', |
120 # Create a GDB Python auto-load file alongside the libxul shared library in |
130 'rasapi32.dll', |
121 # the build directory. |
131 'rasdlg.dll', |
122 PP_TARGETS += LIBXUL_AUTOLOAD |
132 'secur32.dll', |
123 LIBXUL_AUTOLOAD = $(topsrcdir)/toolkit/library/libxul.so-gdb.py.in |
133 'wininet.dll', |
124 LIBXUL_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir)) |
134 'winspool.drv' |
125 endif |
135 ] |
126 |
136 |
127 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
137 +EXTRA_DSO_LDOPTS += CONFIG['NSSHELPER_LIBS'] |
128 + |
138 + |
129 # BFD ld doesn't create multiple PT_LOADs as usual when an unknown section |
139 if CONFIG['MOZ_METRO']: |
130 # exists. Using an implicit linker script to make it fold that section in |
140 DELAYLOAD_DLLS += [ |
131 # .data.rel.ro makes it create multiple PT_LOADs. That implicit linker |
141 'API-MS-WIN-CORE-WINRT-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL', |
132 # script however makes gold misbehave, first because it doesn't like that |
142 'API-MS-WIN-CORE-WINRT-STRING-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL', |
133 # the linker script is given after crtbegin.o, and even past that, replaces |
143 'uiautomationcore.dll' |
134 # the default section rules with those from the script instead of |
144 ] |
135 # supplementing them. Which leads to a lib with a huge load of sections. |
145 |
136 ifneq (OpenBSD,$(OS_TARGET)) |
146 if CONFIG['ACCESSIBILITY']: |