From ba5b85041482d49f5065cd33d8d5c64ef900426f Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 25 Feb 2004 19:18:41 +0000 Subject: add "$xhave_nss = xyes" to the AM_CONDITIONAL for ENABLE_SMIME. 2004-02-25 Chris Toshok * configure.in: add "$xhave_nss = xyes" to the AM_CONDITIONAL for ENABLE_SMIME. svn path=/trunk/; revision=24869 --- ChangeLog | 5 +++++ configure.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 06fe177b3b..6ba2a173da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-02-25 Chris Toshok + + * configure.in: add "$xhave_nss = xyes" to the AM_CONDITIONAL for + ENABLE_SMIME. + 2004-02-24 JP Rosevear * 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) -- cgit v1.2.3