Removed --with-{editor,pager} configure options.

We keep defaulting to vi and more, but search in PATH at run time.
Nowadays, both programs should be available via PATH everywhere.
Otherwise, the the path in the profile.

diff --git a/INSTALL b/INSTALL
index d4f7f242374a8599358443daf134e782b7120658..6811964f36246c5e8b2f7a4b4f347b74dee66494 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -171,14 +171,6 @@ Options for configure
 --enable-mhe    (DEFAULT)
      Add support for the Emacs front-end `mhe'.
 
---with-editor=EDITOR  (DEFAULT is vi)
-     specify the full path of the default editor to use.  If this
-     option is not given, then the configuration process will search
-     for the `vi' command and use it as the default.  If you wish to
-     specify an interface which is compatible with MH, then use the
-     nmh command `prompter'.  If you specify `prompter', then you don't
-     need to give the full pathname.
-
 --with-locking=LOCKTYPE    (DEFAULT is dot)
      Specify the locking mechanism when attempting to "inc" or
      "msgchk" a local mail spool. Valid options are "dot",
@@ -205,11 +197,6 @@ Options for configure
      If either of these options is given then the other must also be
      specified.
 
---with-pager=PAGER    (DEFAULT is more)
-     Specify the default pager (file lister) to use.  If this option
-     is not given, then the configuration process will search for the
-     command `more' and use it as the default.
-
 --
 The nmh team
 nmh-workers@nongnu.org

diff --git a/Makefile.in b/Makefile.in
index 89cd54e280f8c5cc2fb388610df86509bed7289d..85dbf101a4ffe6f7c34d97f9f95ebd687c6c9f4c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,12 +38,6 @@ mailspool   = @mailspool@
 # location of mail transport agent
 sendmailpath = @sendmailpath@
 
-# default editor
-default_editor = @editorpath@
-
-# default pager
-default_pager = @pagerpath@
-
 CC       = @CC@
 CPPFLAGS = @CPPFLAGS@
 DEFS     = @DEFS@ @OURDEFS@
@@ -58,8 +52,7 @@ MAKEDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' \
 CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
 prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
 etcdir='$(etcdir)' libdir='$(libdir)' mandir='$(mandir)' \
-mailspool='$(mailspool)' sendmailpath='$(sendmailpath)' \
-default_editor='$(default_editor)' default_pager='$(default_pager)'
+mailspool='$(mailspool)' sendmailpath='$(sendmailpath)'
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

diff --git a/config/Makefile.in b/config/Makefile.in
index 79d54d5e733f78a410919af3b05bc8513e2b768b..1f1d5aa1fb5bd47c73f17d5a9659b59a8d406e3e 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -17,8 +17,6 @@ bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 
-default_editor = @editorpath@
-default_pager  = @pagerpath@
 sendmailpath   = @sendmailpath@
 
 CC         = @CC@
@@ -26,7 +24,6 @@ CFLAGS     = @CFLAGS@
 DEFS       = @DEFS@
 INCLUDES   = -I.. -I$(top_srcdir) @CPPFLAGS@
 CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' -DNMHLIBDIR='"$(libdir)"' \
-             -DDEFAULT_EDITOR='"$(default_editor)"' -DDEFAULT_PAGER='"$(default_pager)"' \
              -DSENDMAILPATH='"$(sendmailpath)"'
 
 COMPILE  = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)

diff --git a/config/config.c b/config/config.c
index 1a7b72f6f9ced53b6c38bb06e5d1d1cd2eceae8b..82e72aebdfead99230785996d3865090090a213b 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -222,7 +222,7 @@ char *installproc = nmhlibdir (/install-mh);
  * draft message.
  */
 
-char *lproc = DEFAULT_PAGER;
+char *lproc = "more";
 
 /*
  * This is the path for the Bell equivalent mail program.
@@ -236,7 +236,7 @@ char *mailproc = nmhbindir (/mhmail);
  * or message parts of type text/plain.
  */
 
-char *moreproc = DEFAULT_PAGER;
+char *moreproc = "more";
 
 /* 
  * This is the program (mhl) used to filter messages.  It is
@@ -350,7 +350,7 @@ char *backup_prefix = ",";
  * editor, such as vi or emacs, but any editor will work.
  */
 
-char *defaulteditor = DEFAULT_EDITOR;
+char *defaulteditor = "vi";
 
 /* 
  * This is the global nmh alias file.  It is somewhat obsolete, since

diff --git a/configure.ac b/configure.ac
index 274e08d2e2cda0bba22361aefdd2f266bc81d8a3..542fbdec533b5483b670d6c0446a3369b69ab5df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -78,14 +78,6 @@ fi],
 AC_DEFINE(LOCALE)
 )
 
-dnl What should be the default editor?
-AC_ARG_WITH(editor,
-  AS_HELP_STRING([--with-editor=EDITOR],[specify the default editor]))
-
-if test -n "$with_editor"; then
-  editorpath="$with_editor"
-fi
-
 dnl What method of locking to use?
 AC_ARG_WITH(locking,
   AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@],
@@ -269,17 +261,6 @@ if test "$lspath" != "no"; then
   fi])
 fi
 
-dnl Look for `more'
-pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
-AC_PATH_PROG(morepath, more, no, [$pathtmp])
-
-dnl If pager is not specified yet,
-dnl then use `more' as the default.
-if test -z "$pagerpath"; then
-  pagerpath="$morepath"
-fi
-AC_SUBST(pagerpath)dnl
-
 dnl Look for `sendmail'
 pathtmp=/usr/lib:/usr/sbin:/usr/etc:/usr/ucblib:/usr/bin:/bin
 AC_PATH_PROG(sendmailpath, sendmail, /usr/sbin/sendmail, [$pathtmp])
@@ -288,13 +269,6 @@ dnl Look for `vi'
 pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
 AC_PATH_PROG(vipath, vi, /bin/vi, [$pathtmp])
 
-dnl If editor is not specified yet,
-dnl then use `vi' as the default.
-if test -z "$editorpath"; then
-  editorpath="$vipath"
-fi
-AC_SUBST(editorpath)dnl
-
 dnl ----------------------------------------------------------
 dnl FIND MAIL SPOOL AND SEE IF WE NEED TO MAKE inc SETGID MAIL
 dnl ----------------------------------------------------------
@@ -890,9 +864,7 @@ library install path   : ${nmhlib}
 config install path    : ${nmhsysconf}
 man page install path  : ${nmhman}
 
-default editor         : ${editorpath}
-default pager          : ${pagerpath}
-sendmail               : ${sendmailpath}
+sendmail path          : ${sendmailpath}
 
 file locking type      : ${LOCKTYPE}
 email address masq.    : ${masquerade}

diff --git a/man/Makefile.in b/man/Makefile.in
index 5e99542366cd26386130328229cea13254d35bfd..c822d4a6329ef31295cf5472a957df38ef7a5b3e 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -24,9 +24,6 @@ manext8     = 8
 mailspool    = @mailspool@
 sendmailpath = @sendmailpath@
 
-default_editor = @editorpath@
-default_pager = @pagerpath@
-
 INSTALL      = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
@@ -101,8 +98,6 @@ man.sed: Makefile
        echo 's,%mandir%,$(mandir),g' >> $@
        echo 's,%mailspool%,$(mailspool),g' >> $@
        echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
-       echo 's,%default_editor%,$(default_editor),g' >> $@
-       echo 's,%default_pager%,$(default_pager),g' >> $@
        echo 's,%manext1%,$(manext1),g' >> $@
        echo 's,%manext5%,$(manext5),g' >> $@
        echo 's,%manext8%,$(manext8),g' >> $@

diff --git a/man/mh-profile.man b/man/mh-profile.man
index 93eaa8ff0be1c2feb5e249f1cd67d70a6d8d52a5..b7e24ca9066cc41eddf8f86caf8eea5b3a653ab9 100644 (file)
--- a/man/mh-profile.man
+++ b/man/mh-profile.man
@@ -140,7 +140,7 @@ Defines the editor to be used by the commands
 .BR forw ,
 and
 .BR repl .
-(profile, default: %default_editor%)
+(profile, default: vi)
 .RE
 .PP
 .BR Sendmail :
@@ -418,7 +418,7 @@ new users of
 .RE
 .PP
 .BR lproc :
-%default_pager%
+more
 .RS 5
 This program is used to list the contents of a message in response
 to the
@@ -484,7 +484,7 @@ that is sent to \*(lqBcc:\*(rq recipients.
 .RE
 .PP
 .BR moreproc :
-%default_pager%
+more
 .RS 5
 This is the program used by
 .B mhl

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 49c9220a2529b2a2de1aaa4c40f1b3a923d3a708..80b52a18112de28767898e67a233fb9328979bb6 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -42,6 +42,7 @@ static struct proc procs [] = {
      { "context",       &context },
      { "mh-sequences",  &mh_seq },
      { "buildmimeproc", &buildmimeproc },
+     { "editor",        &defaulteditor },
      { "faceproc",      &faceproc },
      { "fileproc",      &fileproc },
      { "foldprot",      &foldprot },