1
0
MozillaThunderbird/thunderbird-shared-nss-db.patch

60 lines
1.8 KiB
Diff
Raw Normal View History

--- mail/app/Makefile.in.orig 2009-02-26 11:02:11.000000000 +0100
+++ mail/app/Makefile.in 2009-02-26 11:04:00.000000000 +0100
@@ -129,6 +129,7 @@
$(EXTRA_DSO_LIBS) \
$(APP_XPCOM_LIBS) \
$(NSPR_LIBS) \
+ $(NSSHELPER_LIBS) \
$(TK_LIBS) \
$(NULL)
Index: config/autoconf.mk.in
===================================================================
RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
retrieving revision 3.464
diff -u -p -6 -r3.464 autoconf.mk.in
--- config/autoconf.mk.in 18 Sep 2008 22:00:51 -0000 3.464
+++ config/autoconf.mk.in 19 Nov 2008 10:12:46 -0000
@@ -532,12 +532,16 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@
LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
LIBIDL_LIBS = @LIBIDL_LIBS@
STATIC_LIBIDL = @STATIC_LIBIDL@
+MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@
+NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@
+NSSHELPER_LIBS = @NSSHELPER_LIBS@
+
MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@
# Used for LD_LIBRARY_PATH
LIBS_PATH = @LIBS_PATH@
MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@
--- configure.in.orig 2009-05-11 19:50:11.000000000 +0200
+++ configure.in 2009-05-11 19:49:35.000000000 +0200
@@ -7028,6 +7028,22 @@ QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(L
AC_SUBST(QCMS_LIBS)
dnl ========================================================
+dnl Check for nss-shared-helper
+dnl ========================================================
+
+ PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper,
+ [MOZ_ENABLE_NSSHELPER=1],
+ [MOZ_ENABLE_NSSHELPER=])
+
+if test "$MOZ_ENABLE_NSSHELPER"; then
+ AC_DEFINE(MOZ_ENABLE_NSSHELPER)
+fi
+AC_SUBST(MOZ_ENABLE_NSSHELPER)
+AC_SUBST(NSSHELPER_CFLAGS)
+AC_SUBST(NSSHELPER_LIBS)
+
+
+dnl ========================================================
dnl disable xul
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(xul,