aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e1f2eb7ed0..77f670175c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-18 JP Rosevear <jpr@ximian.com>
+
+ * configure.in: check for libsoftokn3 if we couldn't link the
+ first time
+
2002-06-14 Chris Toshok <toshok@ximian.com>
* libversit/vobject.c (unUseStr): fix a braindead typo that caused
diff --git a/configure.in b/configure.in
index 461c019b5e..fe35450375 100644
--- a/configure.in
+++ b/configure.in
@@ -938,6 +938,11 @@ if test "x${enable_nss}" = "xyes"; then
[
LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")
+ if test "$moz_nss_libs" = no; then
+ nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"
+ LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
+ AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")
+ fi
LDFLAGS="$LDFLAGS_save"
])
if test "$moz_nss_libs" != no; then