diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-06-20 07:05:26 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-06-20 07:05:26 +0800 |
| commit | c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06 (patch) | |
| tree | 0511fb4033ea74c0bc0c26aad4594868d78277a8 /configure.ac | |
| parent | f4d748a85c534cb8a693b6a1f1b3353adfd73b5b (diff) | |
| parent | ed2d22755ff21516e3284f38eefd080102dd3715 (diff) | |
| download | gsoc2013-evolution-c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06.tar gsoc2013-evolution-c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06.tar.gz gsoc2013-evolution-c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06.tar.bz2 gsoc2013-evolution-c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06.tar.lz gsoc2013-evolution-c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06.tar.xz gsoc2013-evolution-c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06.tar.zst gsoc2013-evolution-c6aabcca4fa3e1af7cbb3b3295ef2c7d61b77d06.zip | |
Merge commit 'EVOLUTION_2_27_3' into kill-bonobo
Conflicts:
composer/e-composer-header-table.h
composer/e-composer-header.c
composer/e-composer-private.c
configure.ac
mail/em-account-editor.c
po/POTFILES.in
po/or.po
widgets/misc/e-search-bar.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6a902f406a..3433bfcd60 100644 --- a/configure.ac +++ b/configure.ac @@ -1212,7 +1212,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then esac fi else - nsslibs="-lssl3 -lsmime3 -lnss3 $SOFTOKN3_LIB" + nsslibs="-lssl3 -lsmime3 -lnss3" fi AC_CACHE_CHECK([for Mozilla nss libraries], ac_cv_moz_nss_libs, |