Attachment #65922 for bug #102487

Lines 8137-8143 Link Here

(-)configure.orig (-2 / +2 lines)
8137	echo "${ECHO_T}$moz_nspr_libs" >&6	8137	echo "${ECHO_T}$moz_nspr_libs" >&6
8138	if test "x$moz_nspr_libs" != "xno"; then	8138	if test "x$moz_nspr_libs" != "xno"; then
8139	have_nspr_libs="yes"	8139	have_nspr_libs="yes"
8140	MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs"	8140	MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs -Wl,-R$with_nspr_libs"
8141	else	8141	else
8142	MANUAL_NSPR_CLFAGS=""	8142	MANUAL_NSPR_CLFAGS=""
8143	fi	8143	fi
Lines 8504-8510 Link Here
8504		8504
8505	msg_smime="yes (Mozilla NSS)"	8505	msg_smime="yes (Mozilla NSS)"
8506	fi	8506	fi
8507	MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs"	8507	MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs -Wl,-R$with_nss_libs"
8508	else	8508	else
8509	MANUAL_NSS_CFLAGS=""	8509	MANUAL_NSS_CFLAGS=""
8510	MANUAL_NSPR_CFLAGS=""	8510	MANUAL_NSPR_CFLAGS=""

Lines 8137-8143 Link Here

(-)configure.in.orig (-2 / +2 lines)
8137	echo "${ECHO_T}$moz_nspr_libs" >&6	8137	echo "${ECHO_T}$moz_nspr_libs" >&6
8138	if test "x$moz_nspr_libs" != "xno"; then	8138	if test "x$moz_nspr_libs" != "xno"; then
8139	have_nspr_libs="yes"	8139	have_nspr_libs="yes"
8140	MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs"	8140	MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs -Wl,-R$with_nspr_libs"
8141	else	8141	else
8142	MANUAL_NSPR_CLFAGS=""	8142	MANUAL_NSPR_CLFAGS=""
8143	fi	8143	fi
Lines 8504-8510 Link Here
8504		8504
8505	msg_smime="yes (Mozilla NSS)"	8505	msg_smime="yes (Mozilla NSS)"
8506	fi	8506	fi
8507	MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs"	8507	MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs -Wl,-R$with_nss_libs"
8508	else	8508	else
8509	MANUAL_NSS_CFLAGS=""	8509	MANUAL_NSS_CFLAGS=""
8510	MANUAL_NSPR_CFLAGS=""	8510	MANUAL_NSPR_CFLAGS=""

Lines 333-339 Link Here

(-)docs/reference/libedataserver/Makefile.in.orig (-1 / +1 lines)
333	####################################	333	####################################
334	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)	334	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
335	@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	335	@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
336	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	336	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
337		337
338	# We set GPATH here; this gives us semantics for GNU make	338	# We set GPATH here; this gives us semantics for GNU make
339	# which are more like other make's VPATH, when it comes to	339	# which are more like other make's VPATH, when it comes to

Lines 33-39 Link Here

(-)docs/reference/libedataserver/Makefile.am.orig (-1 / +1 lines)
33		33
34	if GTK_DOC_USE_LIBTOOL	34	if GTK_DOC_USE_LIBTOOL
35	GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)	35	GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
36	GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	36	GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
37	else	37	else
38	GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)	38	GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
39	GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	39	GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)

Lines 32-38 Link Here

(-)docs/reference/calendar/libecal/Makefile.am.orig (-1 / +1 lines)
32		32
33	if GTK_DOC_USE_LIBTOOL	33	if GTK_DOC_USE_LIBTOOL
34	GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)	34	GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
35	GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	35	GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
36	else	36	else
37	GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)	37	GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
38	GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	38	GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)

Lines 333-339 Link Here

(-)docs/reference/calendar/libecal/Makefile.in.orig (-1 / +1 lines)
333	####################################	333	####################################
334	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)	334	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
335	@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	335	@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
336	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	336	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
337		337
338	# We set GPATH here; this gives us semantics for GNU make	338	# We set GPATH here; this gives us semantics for GNU make
339	# which are more like other make's VPATH, when it comes to	339	# which are more like other make's VPATH, when it comes to

Lines 333-339 Link Here

(-)docs/reference/addressbook/libebook/Makefile.in.orig (-1 / +1 lines)
333	####################################	333	####################################
334	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)	334	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
335	@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	335	@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
336	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	336	@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
337		337
338	# We set GPATH here; this gives us semantics for GNU make	338	# We set GPATH here; this gives us semantics for GNU make
339	# which are more like other make's VPATH, when it comes to	339	# which are more like other make's VPATH, when it comes to

Lines 32-38 Link Here

(-)docs/reference/addressbook/libebook/Makefile.am.orig (-1 / +1 lines)
32		32
33	if GTK_DOC_USE_LIBTOOL	33	if GTK_DOC_USE_LIBTOOL
34	GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)	34	GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
35	GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	35	GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
36	else	36	else
37	GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)	37	GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
38	GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	38	GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)

Return to bug 102487