diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/init.c | 2 | ||||
| -rw-r--r-- | configure.ac | 13 |
3 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 21803480c..dc3b46ef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-04-26 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 24869: Marc Chantreux: configure.ac, Src/init.c: make default + readnullcmd configurable. + 2008-04-24 Peter Stephenson <pws@csr.com> * unposted: Jun T.: Src/Zle/zle_utils.c: backkill() in raw diff --git a/Src/init.c b/Src/init.c index d83e6175b..df859a619 100644 --- a/Src/init.c +++ b/Src/init.c @@ -806,7 +806,7 @@ setupvals(void) term = ztrdup(""); nullcmd = ztrdup("cat"); - readnullcmd = ztrdup("more"); + readnullcmd = ztrdup(DEFAULT_READNULLCMD); /* We cache the uid so we know when to * * recheck the info for `USERNAME' */ diff --git a/configure.ac b/configure.ac index 704f8b1a4..38c027f82 100644 --- a/configure.ac +++ b/configure.ac @@ -334,6 +334,19 @@ fi], [AC_DEFINE(MAX_FUNCTION_DEPTH, 1000)] ) +ifdef([default_readnullcmd],[undefine([default_readnullcmd])])dnl +AH_TEMPLATE([DEFAULT_READNULLCMD], +[Define default pager used by readnullcmd]) +AC_ARG_ENABLE(readnullcmd, +AC_HELP_STRING([--enable-readnullcmd=PAGER], [pager used when READNULLCMD is not set]), +[if test x$enableval = xyes; then + AC_DEFINE(DEFAULT_READNULLCMD,"more") +elif test x$enableval != xno; then + AC_DEFINE_UNQUOTED(DEFAULT_READNULLCMD,"$enableval") +fi], +[AC_DEFINE(DEFAULT_READNULLCMD,"more")] +) + dnl Do you want to look for pcre support? AC_ARG_ENABLE(pcre, AC_HELP_STRING([--enable-pcre], |