drop configure option --with-exec-shell

Using /bin/sh is safe.

diff --git a/INSTALL b/INSTALL
index be41a8939c7ca587462fcd622dcac827cfb4ffe7..75d16b7cb3881e0649258e1b03d045d65e31011d 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -116,22 +116,6 @@ to ``configure'' to help it out, or change the default behavior:
        LC_CTYPE correctly, then you might find you can solve the problem
        with either or both of --enable-locales-fix and --without-wc-funcs.
 
---with-exec-shell=SHELL
-       on some versions of unix, /bin/sh has a bug that makes using emacs
-       with mutt very difficult.  If you have the problem that whenever
-       you press control-G in emacs, mutt and emacs become very confused,
-       you may want to try using a Bourne-derived shell other than
-       /bin/sh here.  Some shells that may work are bash, zsh, and ksh.
-       C shells such as csh and tcsh will amost certainly not work right.
-       Note that this option is unrelated to what shell mutt gives you
-       when you press '!'.  Only use this option to solve the above problem,
-       and only specify one of the above shells as its argument.
-
-       (If you encounter this problem with your platform's native
-       Bourne shell, please send a short report to mutt-dev@mutt.org,
-       so a short note on this topic can be added to the Platform notes
-       section below.)
-
 --enable-exact-address
        By default, Mutt will rewrite all addresses in the form
                Personal Name <user@host.domain>

diff --git a/configure.ac b/configure.ac
index 13fd1e9623275d402bdf060a815fd15507a5a4b7..590570a4d29cfc36ccdf784efba194e1457a93a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -630,15 +630,6 @@ AC_ARG_ENABLE(locales-fix, AS_HELP_STRING([--enable-locales-fix],[The result of
                AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
        fi])
 
-AC_ARG_WITH(exec-shell, AS_HELP_STRING([--with-exec-shell=SHELL],[Specify alternate shell (ONLY if /bin/sh is broken)]),
-       [if test $withval != yes; then
-               AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
-               [program to use for shell commands])
-       else
-               AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh")
-       fi],
-       [AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh")])
-
 AC_ARG_ENABLE(exact-address, AS_HELP_STRING([--enable-exact-address],[Enable regeneration of email addresses]),
        [if test $enableval = yes; then
                AC_DEFINE(EXACT_ADDRESS,1,

diff --git a/filter.c b/filter.c
index 4603bcb06d7ddb5469d2e7db9a093a6492359fe2..a3fec3b72b0e149263bdad085cba360bde433463 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -20,6 +20,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include "filter.h"
+#include "mutt.h"
 #include "mutt_curses.h"
 #include "protos.h"
 

diff --git a/mutt.h b/mutt.h
index 1d43de11ca4fd3d3208c169df094cd26999fe9d8..4c6bc984ba5cd7f523d93f2ff8b9d275a9da6de3 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -348,4 +348,6 @@ struct AttachMatch
 
 #define MUTT_PARTS_TOPLEVEL (1 << 0) /* is the top-level part */
 
+#define EXECSHELL "/bin/sh"
+
 #endif /* _MUTT_H */

diff --git a/version.c b/version.c
index 2ec9410250b6b2fcdba97821372e2047f03a09a4..dea021c7ef384487abf4753e490cba3b7c97653a 100644 (file)
--- a/version.c
+++ b/version.c
@@ -425,7 +425,6 @@ void print_version(void)
 #ifdef DOMAIN
   printf("DOMAIN=\"%s\"\n", DOMAIN);
 #endif
-  printf("EXECSHELL=\"%s\"\n", EXECSHELL);
 #ifdef ISPELL
   printf("ISPELL=\"%s\"\n", ISPELL);
 #endif