diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 15 |
2 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2004-02-19 Chris Toshok <toshok@ximian.com> + + * configure.in: add AC_ARG_ENABLE(smime...) -- "finally", i can + hear the people rejoice. Only check the --enable-smime status if + --enable-ssl is also "yes". AC_DEFINE (ENABLE_SMIME) if smime is + enabled. + 2004-02-18 Rodney Dawes <dobey@ximian.com> * configure.in: Require ORBit 2.9.8 or newer diff --git a/configure.in b/configure.in index 546d5b1801..ffaf1829c6 100644 --- a/configure.in +++ b/configure.in @@ -611,6 +611,9 @@ dnl these 2 enable's are inverses of each other AC_ARG_ENABLE(nss, [ --enable-nss=[yes,no,static] Attempt to use Mozilla libnss for SSL support.], enable_nss="$enableval", enable_nss="yes") +AC_ARG_ENABLE(smime, [ --enable-smime=[yes,no] Attempt to use Mozilla libnss for SMIME support (this requires --enable-nss)], + enable_smime="$enableval", enable_smime="yes") + dnl AC_ARG_ENABLE(openssl, [ --enable-openssl=[no,yes] Attempt to use OpenSSL for SSL support.], dnl enable_openssl="$enableval", enable_openssl="no") dnl @@ -644,8 +647,10 @@ dnl If the user specifies --with-foo or --enable-nss=static, then we have to do PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes") if test "x${have_nss}" = "xyes"; then msg_ssl="yes (Mozilla NSS)" - msg_smime="yes (Mozilla NSS)" - enable_smime="yes" + if test "$enable_smime" = "xyes"; then + AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled]) + msg_smime="yes (Mozilla NSS)" + fi mozilla_nspr="mozilla-nspr" mozilla_nss="mozilla-nss" AC_DEFINE(HAVE_NSS,1,[Define if you have NSS]) @@ -799,8 +804,10 @@ dnl If the user specifies --with-foo or --enable-nss=static, then we have to do else msg_ssl="yes (Mozilla NSS)" fi # static_nss - msg_smime="yes (Mozilla NSS)" - enable_smime="yes" + if test "$enable_smime" = "yes"; then + AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled]) + msg_smime="yes (Mozilla NSS)" + fi MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs" else MANUAL_NSS_CFLAGS="" |