$NetBSD: patch-af,v 1.2 2002/03/05 23:56:24 jlam Exp $

--- configure.orig	Thu Feb 14 03:15:01 2002
+++ configure
@@ -10890,6 +10890,10 @@
   
 
   
+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
+  
+
+  
   APACHE_VAR_SUBST="$APACHE_VAR_SUBST other_targets"
   
 
@@ -11095,10 +11099,6 @@
 EOF
 
 cat >> confdefs.h <<EOF
-#define SERVER_CONFIG_FILE "conf/$progname.conf"
-EOF
-
-cat >> confdefs.h <<EOF
 #define APACHE_MPM_DIR "$MPM_DIR"
 EOF
 
@@ -11223,7 +11223,7 @@
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "$APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk include/ap_config_auto.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "$APACHE_OUTPUT_FILES support/apxs.pl support/apachectl.sh support/dbmmanage.pl support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk include/ap_config_auto.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -11317,6 +11317,7 @@
 s%@errordir@%$errordir%g
 s%@iconsdir@%$iconsdir%g
 s%@installbuilddir@%$installbuilddir%g
+s%@runtimedir@%$runtimedir%g
 s%@other_targets@%$other_targets%g
 s%@CXX@%$CXX%g
 s%@LTFLAGS@%$LTFLAGS%g
@@ -11383,7 +11384,7 @@
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"$APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk"}
+CONFIG_FILES=\${CONFIG_FILES-"$APACHE_OUTPUT_FILES support/apxs.pl support/apachectl.sh support/dbmmanage.pl support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
