Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-shared-nss-db.patch
changeset 191 14282ac75832
parent 164 995e803e8198
child 289 3c0dff7ca9c4 
--- a/mozilla-shared-nss-db.patch	Fri Oct 29 07:19:55 2010 +0200
+++ b/mozilla-shared-nss-db.patch	Mon Nov 08 09:35:44 2010 +0100
@@ -7,7 +7,7 @@
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -564,16 +564,20 @@ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS
+@@ -571,16 +571,20 @@ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS
  
  GLIB_CFLAGS	= @GLIB_CFLAGS@
  GLIB_LIBS	= @GLIB_LIBS@
@@ -31,7 +31,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8550,16 +8550,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8610,16 +8610,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -43,7 +43,7 @@
 +dnl Check for nss-shared-helper
 +dnl ========================================================
 +
-+  PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, 
++  PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper,
 +    [MOZ_ENABLE_NSSHELPER=1],
 +    [MOZ_ENABLE_NSSHELPER=])
 +
@@ -55,18 +55,18 @@
 +AC_SUBST(NSSHELPER_LIBS)
 +
 +dnl ========================================================
+ dnl OTS
+ dnl ========================================================
+ MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
+ AC_SUBST(MOZ_OTS_LIBS)
+ 
+ dnl ========================================================
  dnl disable xul
  dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(xul,
- [  --disable-xul           Disable XUL],
-     MOZ_XUL= )
- if test "$MOZ_XUL"; then
-   AC_DEFINE(MOZ_XUL)
- else
 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
 --- a/security/manager/ssl/src/Makefile.in
 +++ b/security/manager/ssl/src/Makefile.in
-@@ -112,19 +112,20 @@ CSRCS += md4.c
+@@ -117,19 +117,20 @@ CSRCS += md4.c
  
  
  EXTRA_DEPS = $(NSS_DEP_LIBS)
@@ -115,7 +115,7 @@
  
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
-@@ -1647,18 +1654,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
+@@ -1658,18 +1665,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
mozilla