[evolution/kill-bonobo] Don't link against libsoftoken3 explicitly
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution/kill-bonobo] Don't link against libsoftoken3 explicitly
- Date: Wed, 24 Jun 2009 22:58:01 +0000 (UTC)
commit 5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2
Author: Jeff Cai <jeff cai sun com>
Date: Mon Jun 15 00:11:34 2009 +0200
Don't link against libsoftoken3 explicitly
Fixes bug 585523.
configure.ac | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3433bfc..b16d4bd 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]