[evolution] Bug #643402 - Fails to build with --disable-smime

[Milan Crha <mcrha src gnome org>]

commit 6db171ad88bcdd8104a9044b7dead59c0e2e8bf2
Author: Milan Crha <mcrha redhat com>
Date:   Wed Mar 2 17:33:49 2011 +0100

    Bug #643402 - Fails to build with --disable-smime

 mail/em-account-editor.c                   |    8 ++++----
 mail/em-format-html-display.c              |    8 ++++----
 modules/addressbook/e-book-shell-backend.c |    2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index e7973cd..0c2e274 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -68,7 +68,7 @@
 #include "mail-ops.h"
 #include "mail-mt.h"
 
-#if defined (HAVE_NSS)
+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 #include "smime/gui/e-cert-selector.h"
 #endif
 
@@ -1131,7 +1131,7 @@ emae_account_folder (EMAccountEditor *emae, const gchar *name, gint item, gint d
 	return folder;
 }
 
-#if defined (HAVE_NSS)
+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 static void
 smime_changed (EMAccountEditor *emae)
 {
@@ -3116,7 +3116,7 @@ static GtkWidget *
 emae_security_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMAccountEditor *emae = data;
-#if defined (HAVE_NSS)
+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 	EMAccountEditorPrivate *priv = emae->priv;
 #endif
 	GtkWidget *w;
@@ -3136,7 +3136,7 @@ emae_security_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	emae_account_toggle (emae, "pgp_no_imip_sign", E_ACCOUNT_PGP_NO_IMIP_SIGN, builder);
 	emae_account_toggle (emae, "pgp_always_trust", E_ACCOUNT_PGP_ALWAYS_TRUST, builder);
 
-#if defined (HAVE_NSS)
+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 	/* TODO: this should handle its entry separately? */
 	priv->smime_sign_key = emae_account_entry (emae, "smime_sign_key", E_ACCOUNT_SMIME_SIGN_KEY, builder);
 	priv->smime_sign_key_select = (GtkButton *)e_builder_get_widget (builder, "smime_sign_key_select");
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index e654e87..85aba9d 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -50,7 +50,7 @@
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-icon-factory.h>
 
-#ifdef HAVE_NSS
+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 #include "certificate-viewer.h"
 #include "e-cert-db.h"
 #endif
@@ -172,7 +172,7 @@ efhd_xpkcs7mime_info_response (GtkWidget *widget,
 	po->widget = NULL;
 }
 
-#ifdef HAVE_NSS
+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 static void
 efhd_xpkcs7mime_viewcert_clicked (GtkWidget *button,
                                   struct _smime_pobject *po)
@@ -225,14 +225,14 @@ efhd_xpkcs7mime_add_cert_table (GtkWidget *vbox,
 
 		if (l) {
 			GtkWidget *w;
-#if defined(HAVE_NSS)
+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 			ECert *ec = NULL;
 #endif
 			w = gtk_label_new (l);
 			gtk_misc_set_alignment ((GtkMisc *)w, 0.0, 0.5);
 			g_free (la);
 			gtk_table_attach (table, w, 0, 1, n, n+1, GTK_FILL, GTK_FILL, 3, 3);
-#if defined(HAVE_NSS)
+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 			w = gtk_button_new_with_mnemonic(_("_View Certificate"));
 			gtk_table_attach (table, w, 1, 2, n, n+1, 0, 0, 3, 3);
 			g_object_set_data((GObject *)w, "e-cert-info", info);
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index b76764c..cf9011a 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -313,6 +313,7 @@ book_shell_backend_init_preferences (EShell *shell)
 		autocompletion_config_new,
 		200);
 
+#ifdef ENABLE_SMIME
 	preferences_window = e_shell_get_preferences_window (shell);
 	e_preferences_window_add_page (
 		E_PREFERENCES_WINDOW (preferences_window),
@@ -321,6 +322,7 @@ book_shell_backend_init_preferences (EShell *shell)
 		_("Certificates"),
 		certificate_manager_config_new,
 		700);
+#endif
 
 	return FALSE;
 }