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 @@ -548,16 +548,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO |
10 @@ -561,16 +561,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO |
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 MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@ |
29 MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@ |
30 |
30 |
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 @@ -7756,16 +7756,31 @@ AC_SUBST(MOZ_CAIRO_LIBS) |
34 @@ -8016,16 +8016,32 @@ AC_SUBST(QCMS_LIBS) |
35 |
35 |
36 dnl qcms |
|
37 dnl ======================================================== |
36 dnl ======================================================== |
38 |
37 dnl OTS |
39 QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)' |
38 dnl ======================================================== |
40 AC_SUBST(QCMS_LIBS) |
39 MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)' |
|
40 AC_SUBST(MOZ_OTS_LIBS) |
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) |
52 +fi |
52 +fi |
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 + |
57 +dnl ======================================================== |
58 +dnl ======================================================== |
58 dnl disable xul |
59 dnl disable xul |
59 dnl ======================================================== |
60 dnl ======================================================== |
60 MOZ_ARG_DISABLE_BOOL(xul, |
61 MOZ_ARG_DISABLE_BOOL(xul, |
113 #include "nsSSLThread.h" |
114 #include "nsSSLThread.h" |
114 #include "nsCertVerificationThread.h" |
115 #include "nsCertVerificationThread.h" |
115 |
116 |
116 #include "nsNetUtil.h" |
117 #include "nsNetUtil.h" |
117 #include "nsAppDirectoryServiceDefs.h" |
118 #include "nsAppDirectoryServiceDefs.h" |
118 @@ -1600,17 +1607,31 @@ nsNSSComponent::InitializeNSS(PRBool sho |
119 @@ -1606,17 +1613,31 @@ nsNSSComponent::InitializeNSS(PRBool sho |
119 // The call to ConfigureInternalPKCS11Token needs to be done before NSS is initialized, |
120 // The call to ConfigureInternalPKCS11Token needs to be done before NSS is initialized, |
120 // but affects only static data. |
121 // but affects only static data. |
121 // If we could assume i18n will not change between profiles, one call per application |
122 // If we could assume i18n will not change between profiles, one call per application |
122 // run were sufficient. As I can't predict what happens in the future, let's repeat |
123 // run were sufficient. As I can't predict what happens in the future, let's repeat |
123 // this call for every re-init of NSS. |
124 // this call for every re-init of NSS. |