--- evolution-data-server-1.3.7/docs/reference/calendar/libecal/Makefile.am	2004-09-23 16:45:29.000000000 +0000
+++ evolution-data-server-1.3.7-orig/docs/reference/calendar/libecal/Makefile.am	2005-08-19 22:47:17.000000000 +0000
@@ -32,10 +32,10 @@
 
 if GTK_DOC_USE_LIBTOOL
 GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
diff -Nuar evolution-data-server-1.3.7/docs/reference/calendar/libecal/Makefile.in evolution-data-server-1.3.7-orig/docs/reference/calendar/libecal/Makefile.in
--- evolution-data-server-1.3.7/docs/reference/calendar/libecal/Makefile.in	2005-08-08 15:55:35.000000000 +0000
+++ evolution-data-server-1.3.7-orig/docs/reference/calendar/libecal/Makefile.in	2005-08-19 23:05:12.000000000 +0000
@@ -354,8 +354,8 @@
 # Everything below here is generic #
 ####################################
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
 
 # We set GPATH here; this gives us semantics for GNU make
 # which are more like other make's VPATH, when it comes to
diff -Nuar evolution-data-server-1.3.7/docs/reference/calendar/libedata-cal/Makefile.am evolution-data-server-1.3.7-orig/docs/reference/calendar/libedata-cal/Makefile.am
--- evolution-data-server-1.3.7/docs/reference/calendar/libedata-cal/Makefile.am	2005-05-04 12:59:28.000000000 +0000
+++ evolution-data-server-1.3.7-orig/docs/reference/calendar/libedata-cal/Makefile.am	2005-08-19 23:03:29.000000000 +0000
@@ -31,10 +31,10 @@
 
 if GTK_DOC_USE_LIBTOOL
 GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
diff -Nuar evolution-data-server-1.3.7/docs/reference/calendar/libedata-cal/Makefile.in evolution-data-server-1.3.7-orig/docs/reference/calendar/libedata-cal/Makefile.in
--- evolution-data-server-1.3.7/docs/reference/calendar/libedata-cal/Makefile.in	2005-08-08 15:55:35.000000000 +0000
+++ evolution-data-server-1.3.7-orig/docs/reference/calendar/libedata-cal/Makefile.in	2005-08-19 23:04:02.000000000 +0000
@@ -353,8 +353,8 @@
 # Everything below here is generic #
 ####################################
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
 
 # We set GPATH here; this gives us semantics for GNU make
 # which are more like other make's VPATH, when it comes to
diff -Nuar evolution-data-server-1.3.7/docs/reference/addressbook/libebook/Makefile.am evolution-data-server-1.3.7-orig/docs/reference/addressbook/libebook/Makefile.am
--- evolution-data-server-1.3.7/docs/reference/addressbook/libebook/Makefile.am	2004-09-23 16:45:29.000000000 +0000
+++ evolution-data-server-1.3.7-orig/docs/reference/addressbook/libebook/Makefile.am	2005-08-19 23:01:48.000000000 +0000
@@ -32,10 +32,10 @@
 
 if GTK_DOC_USE_LIBTOOL
 GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
diff -Nuar evolution-data-server-1.3.7/docs/reference/addressbook/libebook/Makefile.in evolution-data-server-1.3.7-orig/docs/reference/addressbook/libebook/Makefile.in
--- evolution-data-server-1.3.7/docs/reference/addressbook/libebook/Makefile.in	2005-08-08 15:55:35.000000000 +0000
+++ evolution-data-server-1.3.7-orig/docs/reference/addressbook/libebook/Makefile.in	2005-08-19 23:04:17.000000000 +0000
@@ -354,8 +354,8 @@
 # Everything below here is generic #
 ####################################
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(NSS_LIBS)
 
 # We set GPATH here; this gives us semantics for GNU make
 # which are more like other make's VPATH, when it comes to