From: Ken Hornstein <kenh@pobox.com>
Date: Tue, 15 Jan 2013 18:22:13 +0000 (-0500)
Subject: Remove the --with-pager configure option and replace it with a default
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/81498ba3222c3731cae33bf76ca04a8257b06d3d?hp=-c

Remove the --with-pager configure option and replace it with a default
of "more".
---

81498ba3222c3731cae33bf76ca04a8257b06d3d
diff --git a/Makefile.am b/Makefile.am
index 60600ee8..55886bb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -512,8 +512,7 @@ sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
 		-DMAILSPOOL='"$(mailspool)"' \
 		-DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
 		-DNMHLIBDIR='"$(libdir)"' \
-		-DDEFAULT_EDITOR='"$(editorpath)"' \
-		-DDEFAULT_PAGER='"$(pagerpath)"'
+		-DDEFAULT_EDITOR='"$(editorpath)"'
 
 sbr_libdtimep_a_SOURCES = sbr/dtimep.l
 sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) \
@@ -543,7 +542,6 @@ man/man.sed: Makefile
 	@echo 's,%mailspool%,$(mailspool),g' >> $@
 	@echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
 	@echo 's,%default_editor%,$(editorpath),g' >> $@
-	@echo 's,%default_pager%,$(pagerpath),g' >> $@
 	@echo 's,%manext1%,$(manext1),g' >> $@
 	@echo 's,%manext5%,$(manext5),g' >> $@
 	@echo 's,%manext7%,$(manext7),g' >> $@
diff --git a/configure.ac b/configure.ac
index cf69894f..15f509f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,20 +117,6 @@ AS_IF([test x"$with_mts" = x"smtp"], [MTS="smtp"],
       [MTS="smtp"])
 AC_SUBST([MTS])dnl
 
-dnl What should be the default pager?
-AC_ARG_WITH([pager],
-  AS_HELP_STRING([--with-pager=PAGER],[specify the default pager]))
-
-AS_IF([test -n "$with_pager"], [pagerpath="$with_pager"])
-
-dnl If a pager is not explicitly specified, then look for one.
-dnl Fall back to `cat', to avoid catastrophic failure of
-dnl `mhshow', et al., if pagerpath is set to `no'.
-AS_IF([test -z "$pagerpath"],
-  [pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
-  AC_PATH_PROGS([pagerpath], [more less most cat], [no], [$pathtmp])])
-AC_SUBST([pagerpath])dnl
-
 dnl What should be the default mail server(s)?
 AC_ARG_WITH([smtpservers],
   [AS_HELP_STRING([--with-smtpservers='SMTPSERVER1@<:@ SMTPSERVER2...@:>@'],
@@ -754,7 +740,6 @@ transport system           : ${MTS}
 file locking type          : ${LOCKTYPE}
 default smtp servers       : ${smtpservers}
 default editor             : ${editorpath}
-default pager              : ${pagerpath}
 SASL support               : ${sasl_support}
 TLS support                : ${tls_support}
 ])])dnl
diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index c8dd6231..63d38bae 100644
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -71,6 +71,9 @@ OBSOLETE/DEPRECATED FEATURES
 - Support for encoding some characters designated as EBCDIC-unsafe
   via the -ebcdicsafe and -noebcdicsafe switches to mhbuild has
   been removed.
+- The configure flag --with-pager has been removed; the default pager
+  is now hardcoded as "more".  Users are still free to override the
+  default using the PAGER environment variable or entries in .mh_profile.
 
 ---------
 BUG FIXES
diff --git a/h/nmh.h b/h/nmh.h
index 0ab5e5d6..09683efb 100644
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -61,4 +61,10 @@
 # endif
 #endif
 
+/*
+ * Defaults for programs if they aren't configured in a user's profile
+ */
+
+#define DEFAULT_PAGER "more"
+
 #include <signal.h>
diff --git a/man/mh-profile.man b/man/mh-profile.man
index d1fcf848..8d77900d 100644
--- a/man/mh-profile.man
+++ b/man/mh-profile.man
@@ -417,7 +417,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
@@ -482,7 +482,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/test/common.sh.in b/test/common.sh.in
index f7624ca8..390f94f9 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -13,9 +13,8 @@ test -z "$auxexecdir"  &&  auxexecdir="@libdir@"
 test -z "$bindir"  &&  bindir="@bindir@"
 test -z "$mandir"  &&  mandir="@mandir@"
 test -z "$sysconfdir"  &&  sysconfdir="@sysconfdir@"
-test -z "$pagerpath"  &&  pagerpath="@pagerpath@"
 test -z "$MULTIBYTE_ENABLED"  &&  MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@"
-export MH_TEST_DIR auxexecdir bindir mandir sysconfdir pagerpath
+export MH_TEST_DIR auxexecdir bindir mandir sysconfdir
 export MULTIBYTE_ENABLED
 
 test -z "$MH_INST_DIR"  &&  MH_INST_DIR="${MH_TEST_DIR}/inst"
diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index a56945ca..7af2ef6f 100755
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -84,7 +84,7 @@ $MH_INST_DIR$bindir/refile
 700
 $bindir/inc
 $auxexecdir/install-mh
-$pagerpath
+more
 $bindir/mhmail
 $MH_INST_DIR$auxexecdir/mhl
 cat