5 References: |
5 References: |
6 |
6 |
7 diff --git a/configure.in b/configure.in |
7 diff --git a/configure.in b/configure.in |
8 --- a/configure.in |
8 --- a/configure.in |
9 +++ b/configure.in |
9 +++ b/configure.in |
10 @@ -8089,16 +8089,31 @@ AC_SUBST(QCMS_LIBS) |
10 @@ -8099,16 +8099,31 @@ AC_SUBST(QCMS_LIBS) |
11 |
11 |
12 dnl ======================================================== |
12 dnl ======================================================== |
13 dnl HarfBuzz |
13 dnl HarfBuzz |
14 dnl ======================================================== |
14 dnl ======================================================== |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
40 MOZ_GRAPHITE_LIBS= |
40 MOZ_GRAPHITE_LIBS= |
41 fi |
41 fi |
42 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
42 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
43 --- a/security/manager/ssl/src/Makefile.in |
43 --- a/security/manager/ssl/src/Makefile.in |
44 +++ b/security/manager/ssl/src/Makefile.in |
44 +++ b/security/manager/ssl/src/Makefile.in |
45 @@ -91,12 +91,14 @@ DEFINES += \ |
45 @@ -90,10 +90,13 @@ DEFINES += \ |
|
46 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
|
47 $(NULL) |
46 |
48 |
47 EXPORTS += \ |
49 EXPORTS += \ |
48 nsNSSShutDown.h \ |
50 nsNSSShutDown.h \ |
49 ScopedNSSTypes.h \ |
51 ScopedNSSTypes.h \ |
50 $(NULL) |
52 $(NULL) |
51 |
53 |
52 # Use local includes because they are inserted before INCLUDES |
54 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) |
53 # so that Mozilla's nss.h is used, not glibc's |
55 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
54 -LOCAL_INCLUDES += $(NSS_CFLAGS) |
|
55 +LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS) |
|
56 + |
56 + |
57 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
|
58 |
|
59 include $(topsrcdir)/config/rules.mk |
57 include $(topsrcdir)/config/rules.mk |
60 |
58 |
61 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
59 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
62 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
60 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
63 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
61 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |