From ad8712b0996eb12fa23f971452bed6cd695307a4 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Sat, 11 Nov 2017 23:40:23 +0000
Subject: [PATCH] autosetup: expand --everything in `neomutt -v`

---
 auto.def | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/auto.def b/auto.def
index 36eff6a74..00a931f56 100644
--- a/auto.def
+++ b/auto.def
@@ -299,7 +299,10 @@ if {[get-define want-everything]} {
   foreach opt {gpgme pgp smime notmuch lua tokyocabinet kyotocabinet bdb 
                gdbm qdbm lmdb} {
     define want-$opt
+    append conf_options "--$opt "
   }
+} else {
+  set conf_options "$::argv"
 }
 
 ###############################################################################
@@ -808,7 +811,7 @@ if {[get-define want-gss]} {
 set conststrings "\
   unsigned char cc_version\[\] = {[text2c $cc_version]};\n\
   unsigned char cc_cflags\[\] = {[text2c [get-define CFLAGS]]};\n\
-  unsigned char configure_options\[\] = {[text2c $::argv]};\n"
+  unsigned char configure_options\[\] = {[text2c $conf_options]};\n"
 if {[catch {set fd [open conststrings.c w]
             puts $fd $conststrings
             close $fd} msg]} {
-- 
2.40.0