aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 06fe177b3b..6ba2a173da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-25 Chris Toshok <toshok@ximian.com>
+
+ * configure.in: add "$xhave_nss = xyes" to the AM_CONDITIONAL for
+ ENABLE_SMIME.
+
2004-02-24 JP Rosevear <jpr@ximian.com>
* marshal.mk: make sure to use the srcdir to build the list
diff --git a/configure.in b/configure.in
index 794b8b9ee6..048aa66747 100644
--- a/configure.in
+++ b/configure.in
@@ -824,7 +824,7 @@ dnl If the user specifies --with-foo or --enable-nss=static, then we have to do
fi
fi
-AM_CONDITIONAL(ENABLE_SMIME, test x$enable_smime = xyes)
+AM_CONDITIONAL(ENABLE_SMIME, test x$enable_smime = xyes -a $xhave_nss = xyes)
AC_SUBST(MANUAL_NSPR_CFLAGS)
AC_SUBST(MANUAL_NSPR_LIBS)