2009-12-08 12:41:27 +00:00
|
|
|
From: Hans Petter Jansson <hpj@copyleft.no>
|
|
|
|
Wolfgang Rosenauer <wr@rosenauer.org>
|
|
|
|
Subject: use libnsssharedhelper if available at compile time
|
|
|
|
(can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)
|
|
|
|
References:
|
|
|
|
|
2010-07-24 15:36:48 +00:00
|
|
|
diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
|
|
|
|
--- a/mail/app/Makefile.in
|
|
|
|
+++ b/mail/app/Makefile.in
|
2012-11-20 21:23:42 +00:00
|
|
|
@@ -61,16 +61,17 @@ LOCAL_INCLUDES += \
|
2012-06-06 06:41:25 +00:00
|
|
|
$(NULL)
|
2012-02-01 14:14:46 +00:00
|
|
|
|
2012-06-06 06:41:25 +00:00
|
|
|
DEFINES += -DXPCOM_GLUE
|
|
|
|
STL_FLAGS=
|
2011-08-02 12:57:20 +00:00
|
|
|
|
2010-07-24 15:36:48 +00:00
|
|
|
LIBS += \
|
2009-12-08 12:41:27 +00:00
|
|
|
$(EXTRA_DSO_LIBS) \
|
2011-12-20 08:05:23 +00:00
|
|
|
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
|
2009-12-08 12:41:27 +00:00
|
|
|
+ $(NSSHELPER_LIBS) \
|
|
|
|
$(NULL)
|
|
|
|
|
2012-06-06 06:41:25 +00:00
|
|
|
ifdef MOZ_LINKER
|
2012-11-20 21:23:42 +00:00
|
|
|
LIBS += $(MOZ_ZLIB_LIBS)
|
2011-09-26 13:57:38 +00:00
|
|
|
endif
|
2010-07-24 15:36:48 +00:00
|
|
|
|
2012-06-06 06:41:25 +00:00
|
|
|
ifndef MOZ_WINCONSOLE
|
|
|
|
ifdef MOZ_DEBUG
|