From 5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2 Mon Sep 17 00:00:00 2001
From: Jeff Cai <jeff.cai@sun.com>
Date: Mon, 15 Jun 2009 00:11:34 +0200
Subject: Don't link against libsoftoken3 explicitly

Fixes bug 585523.
---
 configure.ac | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 3433bfcd60..b16d4bd9e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,7 +181,6 @@ case "$host" in
     SA_JUNK_PLUGIN=''
     BF_JUNK_PLUGIN=''
     DL_LIB=''
-    SOFTOKN3_LIB=''
     HAL_REQUIREMENT=''
     ;;
 *)  os_win32=no
@@ -190,7 +189,6 @@ case "$host" in
     SA_JUNK_PLUGIN=sa-junk-plugin 
     BF_JUNK_PLUGIN=bogo-junk-plugin
     DL_LIB='-ldl'
-    SOFTOKN3_LIB='-lsoftokn3'
     HAL_REQUIREMENT='hal'
     ;;
 esac
@@ -1222,7 +1220,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 		      		LIBS="$nsslibs $nsprlibs"
 				AC_TRY_LINK_FUNC(NSS_Init, ac_cv_moz_nss_libs="yes", ac_cv_moz_nss_libs="no")
 				if test "$ac_cv_moz_nss_libs" = no; then
-					nsslibs="-lssl3 -lsmime3 -lnss3 $SOFTOKN3_LIB"
+					nsslibs="-lssl3 -lsmime3 -lnss3"
 					LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
 					AC_TRY_LINK_FUNC(NSS_Init, ac_cv_moz_nss_libs="yes", ac_cv_moz_nss_libs="no")	
 				fi
-- 
cgit