aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am6
-rw-r--r--configure.in8
3 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bdb41fcb08..a308e08f09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-29 Chris Toshok <toshok@ximian.com>
+
+ * Makefile.am (SUBDIRS): use $SMIME_DIR. instead of explicitly
+ including smime.
+
+ * configure.in: add some smime foo - a status message, an
+ AM_CONDITIONAL (ENABLE_SMIME)
+
2003-10-17 Jeffrey Stedfast <fejj@ximian.com>
* configure.in: added a configure check for AI_ADDRCONFIG
diff --git a/Makefile.am b/Makefile.am
index 15bd2a6ec6..93ea62ff7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,10 @@ EXTRA_DIST = \
intltool-extract.in \
$(pkgconfig_DATA:.pc=.pc.in)
+if ENABLE_SMIME
+SMIME_DIR=smime
+endif
+
SUBDIRS = \
data \
e-util \
@@ -34,7 +38,7 @@ SUBDIRS = \
shell \
camel \
filter \
- smime \
+ $(SMIME_DIR) \
addressbook \
calendar \
art \
diff --git a/configure.in b/configure.in
index 36fc58990b..2499993ab1 100644
--- a/configure.in
+++ b/configure.in
@@ -722,6 +722,7 @@ dnl
dnl The Evolution security extensions are only built if these libraries are found
dnl ********************************************************************************
msg_ssl="no"
+msg_smime="no"
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.],
@@ -760,6 +761,8 @@ 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"
mozilla_nspr="mozilla-nspr"
mozilla_nss="mozilla-nss"
AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
@@ -910,8 +913,10 @@ dnl If the user specifies --with-foo or --enable-nss=static, then we have to do
AC_DEFINE(HAVE_SSL)
if test "$enable_nss" = "static"; then
msg_ssl="yes (Mozilla NSS:static)"
+ msg_smime="yes (Mozilla NSS:static)"
else
msg_ssl="yes (Mozilla NSS)"
+ msg_smime="yes (Mozilla NSS)"
fi # static_nss
MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs"
else
@@ -929,6 +934,8 @@ 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)
+
AC_SUBST(MANUAL_NSPR_CFLAGS)
AC_SUBST(MANUAL_NSPR_LIBS)
AC_SUBST(MANUAL_NSS_CFLAGS)
@@ -1453,6 +1460,7 @@ echo "\
Pilot conduits: $msg_pilot
Kerberos 4/5: $msg_krb4/$msg_krb5
SSL support: $msg_ssl
+ SMIME support: $msg_smime
IPv6 support: $msg_ipv6
Dot Locking: $msg_dot
File Locking: $msg_file