Allow apachectl to perform status with links and elinks as well if lynx is

not available.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98674 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index fe3fa127bc9152032841d380b0107b75260a16ca..3c474a6eb7bef6d76e046c1c91a88caa3eb4ef20 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Allow apachectl to perform status with links and elinks as well.
+     [Justin Erenkrantz]
+
   *) Fix segfault which occurred when a section in an included file was
      not closed. PR 17093.  [André Malo]
 

diff --git a/configure.in b/configure.in
index 7d68edcd70c1b341f1496be6e785958359b51548..131ca55e004ac2434d7484dad97b644d7f0435b8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -237,6 +237,7 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_CHECK_TOOL(RANLIB, ranlib, true)
 dnl AC_PATH_PROG(PERL_PATH, perl)
+AC_CHECK_PROGS(LYNX_PATH,[lynx links elinks], [lynx])
 
 dnl various OS checks that apparently set required flags
 AC_AIX

diff --git a/support/apachectl.in b/support/apachectl.in
index 35eab250d0e528a9ca7bf7bf1ecc0d5101b9bdc5..7584a8744876bb8e3ac2d658869ad8f14d8ea344 100644 (file)
--- a/support/apachectl.in
+++ b/support/apachectl.in
@@ -38,7 +38,7 @@ fi
 # a command that outputs a formatted text version of the HTML at the
 # url given on the command line.  Designed for lynx, however other
 # programs may work.  
-LYNX="lynx -dump"
+LYNX="@LYNX_PATH@ -dump"
 #
 # the URL to your server's mod_status status page.  If you do not
 # have one, then status and fullstatus will not work.