build-sys: fix compilation without --enable-notmuch

We can still leave mutt-kz compilable entirely without notmuch, just for the
case there are users out there not interested in notmuch enhancements, but I
seriously doubt that :)

Here's the patch which compiles fine without --enable-notmuch

[kzak@redhat.com: - fix s/Incomming/Incoming/ typo]

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/buffy.c b/buffy.c
index f2d33eb61fa7377dac0141be55d902d006b1aef8..08a7b087934503f41ad40a08d931658a378c6ee1 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -700,8 +700,12 @@ int mutt_buffy_check (int force)
 #endif
 
   /* fastest return if there are no mailboxes */
+#ifdef USE_NOTMUCH
   if (!Incoming && !VirtIncoming)
     return 0;
+#endif
+  if (!Incoming)
+    return 0;
   t = time (NULL);
   if (!force && (t - BuffyTime < BuffyTimeout))
     return BuffyCount;
@@ -733,8 +737,10 @@ int mutt_buffy_check (int force)
     buffy_check(tmp, &contex_sb);
 #endif
 
+#ifdef USE_NOTMUCH
   for (tmp = VirtIncoming; tmp; tmp = tmp->next)
     buffy_check(tmp, &contex_sb);
+#endif
 
   BuffyDoneTime = BuffyTime;
   return (BuffyCount);

diff --git a/curs_main.c b/curs_main.c
index 851adb740e5ab0ebeb292380b4757569e32af9ad..433ce308873a87e72bdfb4ca3a620c980f1686c1 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -969,10 +969,10 @@ int mutt_index_menu (void)
       mutt_curs_set (1);       /* fallback from the pager */
     }
 
+#ifdef USE_NOTMUCH
     if (Context)
-    {
       nm_debug_check(Context);
-    }
+#endif
 
     switch (op)
     {
@@ -2619,11 +2619,10 @@ int mutt_index_menu (void)
          km_error_key (MENU_MAIN);
     }
 
+#ifdef USE_NOTMUCH
     if (Context)
-    {
       nm_debug_check(Context);
-    }
-
+#endif
 
     if (menu->menu == MENU_PAGER)
     {

diff --git a/sidebar.c b/sidebar.c
index ce4debe1484082c036df1c8980230ea2ba422301..35aeb6f899ffb0bd680a2535c8ce035ae427c2d1 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -66,6 +66,7 @@ get_incoming (void)
        case SB_SRC_NONE:
                sidebar_source = SB_SRC_INCOMING;
 
+#ifdef USE_NOTMUCH
                if (option (OPTVIRTSPOOLFILE) && VirtIncoming) {
                        sidebar_source = SB_SRC_VIRT;
                        return VirtIncoming;
@@ -76,6 +77,7 @@ get_incoming (void)
                        return VirtIncoming;
                }
                break;
+#endif
        case SB_SRC_INCOMING:
                break;
        }