From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 10 May 2017 15:09:24 +0000 (-0400)
Subject: *: Allow configure to control VTYSH_PAGER used
X-Git-Tag: reindent-master-before~180^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=08c369bda98a28e9bfb148f25749319648f61f1b;p=mirror%2Ffrr.git

*: Allow configure to control VTYSH_PAGER used

Signed-off-by: Donald Sharp
---

diff --git a/configure.ac b/configure.ac
index 340b0a953b..fa10baf8fa 100755
--- a/configure.ac
+++ b/configure.ac
@@ -228,6 +228,9 @@ AC_ARG_WITH(pkg-extra-version,
 AC_ARG_WITH(pkg-git-version,
 	AS_HELP_STRING([--with-pkg-git-version], [add git information to MOTD and build version string]),
 	[ test "x$withval" != "xno" && with_pkg_git_version="yes" ])
+AC_ARG_WITH(vtysh_pager,
+	AS_HELP_STRING([--with-vtysh-pager=PAGER], [control what pager is compiled in as default]),
+	VTYSH_PAGER=$withval, VTYSH_PAGER="more")
 AC_ARG_ENABLE(vtysh,
   AS_HELP_STRING([--disable-vtysh], [do not build integrated vty shell for Quagga]))
 AC_ARG_ENABLE(doc,
@@ -532,6 +535,8 @@ esac
 
 AC_DEFINE_UNQUOTED(MULTIPATH_NUM, $MPATH_NUM, Maximum number of paths for a route)
 
+AC_DEFINE_UNQUOTED(VTYSH_PAGER, "$VTYSH_PAGER", [What pager to use])
+
 dnl -----------------------------------
 dnl Add extra version string to package
 dnl name, string and version fields.
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index b029db2337..3967cfc934 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -264,7 +264,7 @@ vtysh_pager_init (void)
   if (pager_defined)
     vtysh_pager_name = strdup (pager_defined);
   else
-    vtysh_pager_name = strdup ("more");
+    vtysh_pager_name = strdup (VTYSH_PAGER);
 }
 
 /* Command execution over the vty interface. */