From f0610367db80b2210a213ef3cecaf60311ecd859 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Sun, 1 May 2016 16:35:55 +0100
Subject: [PATCH] Revert "enabling notmuch enables sidebar"

Not the right solution.
---
 configure.ac | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 612a3f63b..79473ed8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,15 @@ if test x$have_smime != xno ; then
 	SMIMEAUX_TARGET="smime_keys"
 fi
 
+AC_ARG_ENABLE(sidebar, AC_HELP_STRING([--enable-sidebar], [Enable Sidebar support]),
+[       if test x$enableval = xyes ; then
+		AC_DEFINE(USE_SIDEBAR,1,[ Define if you want support for the sidebar. ])
+		OPS="$OPS \$(srcdir)/OPS.SIDEBAR"
+		need_sidebar="yes"
+        fi
+])
+AM_CONDITIONAL(BUILD_SIDEBAR, test x$need_sidebar = xyes)
+
 AC_ARG_ENABLE(notmuch, AC_HELP_STRING([--enable-notmuch], [Enable NOTMUCH support]),
 [       if test x$enableval = xyes ; then
 		AC_CHECK_LIB(notmuch, notmuch_database_open,,
@@ -183,7 +192,6 @@ AC_ARG_ENABLE(notmuch, AC_HELP_STRING([--enable-notmuch], [Enable NOTMUCH suppor
 		NOTMUCH_LIBS="-lnotmuch"
 		OPS="$OPS \$(srcdir)/OPS.NOTMUCH"
 		need_notmuch="yes"
-		need_sidebar="yes"
 
 		AC_MSG_CHECKING([for notmuch api version 3])
 		AC_COMPILE_IFELSE( [AC_LANG_PROGRAM(
@@ -200,16 +208,6 @@ AC_ARG_ENABLE(notmuch, AC_HELP_STRING([--enable-notmuch], [Enable NOTMUCH suppor
 ])
 AM_CONDITIONAL(BUILD_NOTMUCH, test x$need_notmuch = xyes)
 
-AC_ARG_ENABLE(sidebar, AC_HELP_STRING([--enable-sidebar], [Enable Sidebar support]),
-[       if test x$enableval = xyes ; then
-		need_sidebar="yes"
-        fi
-])
-AS_IF([test "x$need_sidebar" = "xyes"], [
-	AC_DEFINE(USE_SIDEBAR,1,[ Define if you want support for the sidebar. ])
-	OPS="$OPS \$(srcdir)/OPS.SIDEBAR"
-])
-AM_CONDITIONAL(BUILD_SIDEBAR, test x$need_sidebar = xyes)
 
 AC_ARG_WITH(mixmaster, AS_HELP_STRING([--with-mixmaster@<:@=PATH@:>@],[Include Mixmaster support]),
   [if test "$withval" != no
-- 
2.50.1