diff options
| author | Jeff Cai <jeff.cai@sun.com> | 2009-06-15 06:11:34 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-06-24 22:28:47 +0800 |
| commit | 5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2 (patch) | |
| tree | 8a5934804aa2e4566d0a68f9d78523e640dda470 | |
| parent | 9ef14bd7eb341f176b4f8ce24b1679d5ef6aee2e (diff) | |
| download | gsoc2013-evolution-5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2.tar gsoc2013-evolution-5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2.tar.gz gsoc2013-evolution-5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2.tar.bz2 gsoc2013-evolution-5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2.tar.lz gsoc2013-evolution-5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2.tar.xz gsoc2013-evolution-5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2.tar.zst gsoc2013-evolution-5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2.zip | |
Don't link against libsoftoken3 explicitly
Fixes bug 585523.
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 1 insertions, 3 deletions
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 |