Attachment #36807 for issue #65912

View | Details | Raw Unified | Return to issue 65912
Collapse All | Expand All

Lines 3108-3113 Link Here

(-)config_office.orig/configure.in (+5 lines)
3108		3108
3109	if $PKG_CONFIG --exists nspr ; then	3109	if $PKG_CONFIG --exists nspr ; then
3110	PKG_CHECK_MODULES( MOZ_NSPR, nspr )	3110	PKG_CHECK_MODULES( MOZ_NSPR, nspr )
		3111	NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
		3112	AC_SUBST(NSPR_LIB)
3111	else	3113	else
3112	PKG_CHECK_MODULES( MOZ_NSPR, mozilla-nspr )	3114	PKG_CHECK_MODULES( MOZ_NSPR, mozilla-nspr )
3113	fi	3115	fi
Lines 3115-3120 Link Here
3115	PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )	3117	PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
3116	if test -z "$STANDALONENSS"; then	3118	if test -z "$STANDALONENSS"; then
3117	PKG_CHECK_MODULES( MOZ_NSS, $moz_flavour-nss )	3119	PKG_CHECK_MODULES( MOZ_NSS, $moz_flavour-nss )
		3120	else
		3121	NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
		3122	AC_SUBST(NSS_LIB)
3118	fi	3123	fi
3119		3124
3120	save_CPPFLAGS="$CPPFLAGS"	3125	save_CPPFLAGS="$CPPFLAGS"

Lines 108-113 Link Here

(-)xmlsecurity.orig/util/makefile.mk (+9 lines)
108	$(CPPUHELPERLIB) \	108	$(CPPUHELPERLIB) \
109	$(XMLOFFLIB)	109	$(XMLOFFLIB)
110		110
		111	.IF "$(SYSTEM_MOZILLA)" == "YES"
		112	.IF "$(NSPR_LIB)" != ""
		113	SHL2STDLIBS += $(NSPR_LIB)
		114	.ENDIF
		115	.IF "$(NSS_LIB)" != ""
		116	SHL2STDLIBS += $(NSS_LIB)
		117	.ENDIF
		118	.ENDIF
		119
111	.IF "$(CRYPTO_ENGINE)" == "mscrypto"	120	.IF "$(CRYPTO_ENGINE)" == "mscrypto"
112	SHL2STDLIBS+= $(MSCRYPTOLIBS)	121	SHL2STDLIBS+= $(MSCRYPTOLIBS)
113	.ELSE	122	.ELSE

Return to issue 65912