5 References: |
5 References: |
6 |
6 |
7 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
7 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
8 --- a/config/autoconf.mk.in |
8 --- a/config/autoconf.mk.in |
9 +++ b/config/autoconf.mk.in |
9 +++ b/config/autoconf.mk.in |
10 @@ -564,16 +564,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS |
10 @@ -571,16 +571,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS |
11 |
11 |
12 GLIB_CFLAGS = @GLIB_CFLAGS@ |
12 GLIB_CFLAGS = @GLIB_CFLAGS@ |
13 GLIB_LIBS = @GLIB_LIBS@ |
13 GLIB_LIBS = @GLIB_LIBS@ |
14 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
14 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
15 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
15 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
29 MDDEPDIR := @MDDEPDIR@ |
29 MDDEPDIR := @MDDEPDIR@ |
30 CC_WRAPPER = @CC_WRAPPER@ |
30 CC_WRAPPER = @CC_WRAPPER@ |
31 diff --git a/configure.in b/configure.in |
31 diff --git a/configure.in b/configure.in |
32 --- a/configure.in |
32 --- a/configure.in |
33 +++ b/configure.in |
33 +++ b/configure.in |
34 @@ -8550,16 +8550,31 @@ AC_SUBST(QCMS_LIBS) |
34 @@ -8610,16 +8610,31 @@ AC_SUBST(QCMS_LIBS) |
35 |
35 |
36 dnl ======================================================== |
36 dnl ======================================================== |
37 dnl HarfBuzz |
37 dnl HarfBuzz |
38 dnl ======================================================== |
38 dnl ======================================================== |
39 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
39 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
41 |
41 |
42 dnl ======================================================== |
42 dnl ======================================================== |
43 +dnl Check for nss-shared-helper |
43 +dnl Check for nss-shared-helper |
44 +dnl ======================================================== |
44 +dnl ======================================================== |
45 + |
45 + |
46 + PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, |
46 + PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, |
47 + [MOZ_ENABLE_NSSHELPER=1], |
47 + [MOZ_ENABLE_NSSHELPER=1], |
48 + [MOZ_ENABLE_NSSHELPER=]) |
48 + [MOZ_ENABLE_NSSHELPER=]) |
49 + |
49 + |
50 +if test "$MOZ_ENABLE_NSSHELPER"; then |
50 +if test "$MOZ_ENABLE_NSSHELPER"; then |
51 + AC_DEFINE(MOZ_ENABLE_NSSHELPER) |
51 + AC_DEFINE(MOZ_ENABLE_NSSHELPER) |
53 +AC_SUBST(MOZ_ENABLE_NSSHELPER) |
53 +AC_SUBST(MOZ_ENABLE_NSSHELPER) |
54 +AC_SUBST(NSSHELPER_CFLAGS) |
54 +AC_SUBST(NSSHELPER_CFLAGS) |
55 +AC_SUBST(NSSHELPER_LIBS) |
55 +AC_SUBST(NSSHELPER_LIBS) |
56 + |
56 + |
57 +dnl ======================================================== |
57 +dnl ======================================================== |
|
58 dnl OTS |
|
59 dnl ======================================================== |
|
60 MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)' |
|
61 AC_SUBST(MOZ_OTS_LIBS) |
|
62 |
|
63 dnl ======================================================== |
58 dnl disable xul |
64 dnl disable xul |
59 dnl ======================================================== |
65 dnl ======================================================== |
60 MOZ_ARG_DISABLE_BOOL(xul, |
|
61 [ --disable-xul Disable XUL], |
|
62 MOZ_XUL= ) |
|
63 if test "$MOZ_XUL"; then |
|
64 AC_DEFINE(MOZ_XUL) |
|
65 else |
|
66 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
66 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
67 --- a/security/manager/ssl/src/Makefile.in |
67 --- a/security/manager/ssl/src/Makefile.in |
68 +++ b/security/manager/ssl/src/Makefile.in |
68 +++ b/security/manager/ssl/src/Makefile.in |
69 @@ -112,19 +112,20 @@ CSRCS += md4.c |
69 @@ -117,19 +117,20 @@ CSRCS += md4.c |
70 |
70 |
71 |
71 |
72 EXTRA_DEPS = $(NSS_DEP_LIBS) |
72 EXTRA_DEPS = $(NSS_DEP_LIBS) |
73 |
73 |
74 DEFINES += -DNSS_ENABLE_ECC |
74 DEFINES += -DNSS_ENABLE_ECC |
113 #include "nsSSLThread.h" |
113 #include "nsSSLThread.h" |
114 #include "nsCertVerificationThread.h" |
114 #include "nsCertVerificationThread.h" |
115 |
115 |
116 #include "nsNetUtil.h" |
116 #include "nsNetUtil.h" |
117 #include "nsAppDirectoryServiceDefs.h" |
117 #include "nsAppDirectoryServiceDefs.h" |
118 @@ -1647,18 +1654,34 @@ nsNSSComponent::InitializeNSS(PRBool sho |
118 @@ -1658,18 +1665,34 @@ nsNSSComponent::InitializeNSS(PRBool sho |
119 ConfigureInternalPKCS11Token(); |
119 ConfigureInternalPKCS11Token(); |
120 |
120 |
121 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
121 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
122 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
122 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
123 // later. It also allows us to work around a bug in the system NSS in |
123 // later. It also allows us to work around a bug in the system NSS in |