|
1 From: Hans Petter Jansson <hpj@copyleft.no> |
|
2 Wolfgang Rosenauer <wr@rosenauer.org> |
|
3 Subject: use libnsssharedhelper if available at compile time |
|
4 (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) |
|
5 References: |
|
6 |
|
7 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
|
8 --- a/config/autoconf.mk.in |
|
9 +++ b/config/autoconf.mk.in |
|
10 @@ -478,16 +478,20 @@ MOZ_XIE_LIBS = @MOZ_XIE_LIBS@ |
|
11 XT_LIBS = @XT_LIBS@ |
|
12 |
|
13 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
|
14 |
|
15 GLIB_CFLAGS = @GLIB_CFLAGS@ |
|
16 GLIB_LIBS = @GLIB_LIBS@ |
|
17 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
|
18 |
|
19 +MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@ |
|
20 +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ |
|
21 +NSSHELPER_LIBS = @NSSHELPER_LIBS@ |
|
22 + |
|
23 MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ |
|
24 |
|
25 # Used for LD_LIBRARY_PATH |
|
26 LIBS_PATH = @LIBS_PATH@ |
|
27 |
|
28 MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ |
|
29 COMPILER_DEPEND = @COMPILER_DEPEND@ |
|
30 MDDEPDIR := @MDDEPDIR@ |
|
31 diff --git a/configure.in b/configure.in |
|
32 --- a/configure.in |
|
33 +++ b/configure.in |
|
34 @@ -6979,16 +6979,31 @@ AC_SUBST(MOZ_CAIRO_LIBS) |
|
35 |
|
36 dnl qcms |
|
37 dnl ======================================================== |
|
38 |
|
39 QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)' |
|
40 AC_SUBST(QCMS_LIBS) |
|
41 |
|
42 dnl ======================================================== |
|
43 +dnl Check for nss-shared-helper |
|
44 +dnl ======================================================== |
|
45 + |
|
46 + PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, |
|
47 + [MOZ_ENABLE_NSSHELPER=1], |
|
48 + [MOZ_ENABLE_NSSHELPER=]) |
|
49 + |
|
50 +if test "$MOZ_ENABLE_NSSHELPER"; then |
|
51 + AC_DEFINE(MOZ_ENABLE_NSSHELPER) |
|
52 +fi |
|
53 +AC_SUBST(MOZ_ENABLE_NSSHELPER) |
|
54 +AC_SUBST(NSSHELPER_CFLAGS) |
|
55 +AC_SUBST(NSSHELPER_LIBS) |
|
56 + |
|
57 +dnl ======================================================== |
|
58 dnl disable xul |
|
59 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 fi |
|
66 diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in |
|
67 --- a/suite/app/Makefile.in |
|
68 +++ b/suite/app/Makefile.in |
|
69 @@ -112,16 +112,17 @@ APP_XPCOM_LIBS = $(XPCOM_LIBS) |
|
70 endif |
|
71 |
|
72 LIBS += \ |
|
73 $(STATIC_COMPONENTS_LINKER_PATH) \ |
|
74 $(MOZ_JS_LIBS) \ |
|
75 $(EXTRA_DSO_LIBS) \ |
|
76 $(APP_XPCOM_LIBS) \ |
|
77 $(NSPR_LIBS) \ |
|
78 + $(NSSHELPER_LIBS) \ |
|
79 $(TK_LIBS) \ |
|
80 $(NULL) |
|
81 |
|
82 # Add explicit X11 dependency when building against X11 toolkits |
|
83 ifneq (,$(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT))) |
|
84 LIBS += $(XLDFLAGS) $(XLIBS) |
|
85 endif |
|
86 |