Re: [evolution-patches][Miscellaneous] Fix for bug#325748

["simon.zheng" <Simon Zheng Sun COM>]

Hi Harish/Jeffrey,

Update the patch. The new search path is retrieved from "--with-nss-libs
option" or pkg-config tool when running configure.

Please review and comment.

Thanks,
-Simon

On Fri, 2006-01-06 at 11:46 +0530, Harish Krishnaswamy wrote:
> On Thu, 2006-01-05 at 19:17 +0800, Harry Lu wrote:
> > We have a "--with-nss-libs " option in configure.in. 
> > Simon Zheng is working on a patch to add the specified path into the
> > search path list.
> > 
> > This should solve most of the problem. Is this OK?
> > 
> Yes. This approach looks good.
> 
> Harish
> 
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches gnome org
> http://mail.gnome.org/mailman/listinfo/evolution-patches

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1553
diff -u -p -r1.1553 ChangeLog
--- ChangeLog	7 Jan 2006 11:38:19 -0000	1.1553
+++ ChangeLog	9 Jan 2006 04:40:43 -0000
@@ -1,3 +1,8 @@
+2006-01-09  Simon Zheng  <simon zheng sun com>
+
+	* configure.in: Add the macro MOZILLA_NSS_LIB_DIR to store mozilla
+	nss library path.
+
 2006-01-07  Tor Lillqvist  <tml novell com>
 
 	* server.mk: Add whitespace before all line continuation
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.868
diff -u -p -r1.868 configure.in
--- configure.in	2 Jan 2006 16:35:41 -0000	1.868
+++ configure.in	9 Jan 2006 04:40:45 -0000
@@ -755,6 +755,7 @@ dnl If the user specifies --with-foo or 
 			mozilla_nss="mozilla-nss"
 			AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
 			AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])
+			AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,`$PKG_CONFIG --variable=libdir mozilla-nss`,[Define to the full path of mozilla nss library])
 			MANUAL_NSPR_CFLAGS=""
 			MANUAL_NSPR_LIBS=""
 			MANUAL_NSS_CFLAGS=""
@@ -899,6 +900,7 @@ dnl If the user specifies --with-foo or 
 			if test "$moz_nss_libs" != no; then
 				AC_DEFINE(HAVE_NSS)
 				AC_DEFINE(HAVE_SSL)
+				AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"$with_nss_libs", [Define to the full path of mozilla nss library])
 				if test "$enable_nss" = "static"; then
 					msg_ssl="yes (Mozilla NSS:static)"
 		 		else
Index: smime/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/smime/ChangeLog,v
retrieving revision 1.59
diff -u -p -r1.59 ChangeLog
--- smime/ChangeLog	6 Jan 2006 14:10:32 -0000	1.59
+++ smime/ChangeLog	9 Jan 2006 04:44:10 -0000
@@ -1,3 +1,8 @@
+2006-01-09  Simon Zheng  <simon zheng sun com>
+
+	* lib/e-cert-db.c: (install_loadable_roots): Add the search path 
+	which can be automatically retrieved when running configure.
+
 2006-01-06  Andre Klapper <a9016009 gmx de>
 	* lib/e-cert-c: marked LDAP specifix strings as not translatable.
 	  Fixes bug 273076.
Index: smime/lib/e-cert-db.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/lib/e-cert-db.c,v
retrieving revision 1.19
diff -u -p -r1.19 e-cert-db.c
--- smime/lib/e-cert-db.c	18 Dec 2005 08:36:11 -0000	1.19
+++ smime/lib/e-cert-db.c	9 Jan 2006 04:44:10 -0000
@@ -275,6 +275,9 @@ install_loadable_roots (void)
 		char *paths_to_check[] = {
 			"/usr/lib",
 			"/usr/lib/mozilla",
+#ifdef MOZILLA_NSS_LIB_DIR
+			MOZILLA_NSS_LIB_DIR,
+#endif
 			"/opt/mozilla/lib",
 			"/opt/mozilla/lib/mozilla"
 		};