| @@ -0,0 +1,65 @@
+diff -uNr httpd-2.1.3-alpha.orig/support/apachectl.in httpd-2.1.3-alpha/support/apachectl.in
+--- httpd-2.1.3-alpha.orig/support/apachectl.in 2005-02-04 21:28:49.000000000 +0100
++++ httpd-2.1.3-alpha/support/apachectl.in 2005-02-25 02:52:49.203566813 +0100
+@@ -41,17 +41,32 @@
+ # -------------------- --------------------
+ #
+ # the path to your httpd binary, including options if necessary
+-HTTPD='@exp_sbindir@/@progname@'
++HTTPD='@exp_sbindir@/httpd2'
+ #
+ # pick up any necessary environment variables
+ if test -f @exp_sbindir@/envvars; then
+ . @exp_sbindir@/envvars
+ fi
++
++pname=apache2
++sysconfig_apache=/etc/sysconfig/$pname
++sysconfdir=/etc/$pname
++
++test -s $sysconfig_apache && source $sysconfig_apache
++httpd_conf=${APACHE_HTTPD_CONF:-$sysconfdir/httpd.conf}
++
+ #
+ # 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_PATH@ -dump"
++
++if [ -x "`which w3m`" ]; then
++ LYNX="w3m -dump -cols ${COLUMNS:-80}"
++elif [ -x "`which lynx`" ]; then
++ LYNX="lynx -dump -width=${COLUMNS:-80}"
++fi
++
++
+ #
+ # the URL to your server's mod_status status page. If you do not
+ # have one, then status and fullstatus will not work.
+@@ -77,7 +92,7 @@
+
+ case $ARGV in
+ start|stop|restart|graceful|graceful-stop)
+- $HTTPD -k $ARGV
++ $HTTPD ${httpd_conf+-f $httpd_conf} -k $ARGV
+ ERROR=$?
+ ;;
+ startssl|sslstart|start-SSL)
+@@ -87,7 +102,7 @@
+ ERROR=2
+ ;;
+ configtest)
+- $HTTPD -t
++ $HTTPD ${httpd_conf+-f $httpd_conf} -t
+ ERROR=$?
+ ;;
+ status)
+@@ -97,7 +112,7 @@
+ $LYNX $STATUSURL
+ ;;
+ *)
+- $HTTPD $ARGV
++ $HTTPD ${httpd_conf+-f $httpd_conf} $ARGV
+ ERROR=$?
+ esac
+
|
