httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@Covalent.NET>
Subject [PATCH] APACI configure changes
Date Mon, 30 Nov 1998 07:14:38 GMT

The following patch changes/fixes the following items:

* Revert to old "--compat" format as the default. Use --GNU-paths to
  get the "new" layout.

* Create a toplevel Makefile if using 'Configure' script. This helps
  the "least astonishment" factor since we refer them to the toplevel
  directory if they want to do a 'make install'.

* Only create the httpd.conf file and don't confuse the configuration
  by creating the old stub files for srm.conf and access.conf.

* Make use of $TARGET with APACI configure. $TARGET is then used to
  base the name of the configuration file, pidfile, logfile, etc.

If I don't get any immediate opposition to this, I'll commit sometime
tomorrow afternoon. I've hammered this reasonably hard, but perhaps 
those more intimately familiar with APACI could make sure I have not 
broken something.

Index: Makefile.tmpl
===================================================================
RCS file: /usr/local/covalent/.CVS/apache/apache-1.3/Makefile.tmpl,v
retrieving revision 1.50
diff -c -r1.50 Makefile.tmpl
*** Makefile.tmpl	1998/11/13 11:25:01	1.50
--- Makefile.tmpl	1998/11/30 06:41:39
***************
*** 66,71 ****
--- 66,74 ----
  ##                              Options
  ## ==================================================================
  
+ #   target name
+ TARGET		= @TARGET@
+ 
  #   safe environment
  SHELL           = /bin/sh
  
***************
*** 199,207 ****
  		echo "| You now have successfully built and installed the      |"; \
  		echo "| Apache 1.3 HTTP server. To verify that Apache actually |"; \
  		echo "| works correctly you now should first check the         |"; \
! 		echo "| (initially created or preserved) configuration files   |"; \
  		echo "|                                                        |"; \
! 		echo "|   $(sysconfdir)/{httpd,access,srm}.conf"; \
  		echo "|                                                        |"; \
  		echo "| and then you should be able to immediately fire up     |"; \
  		echo "| Apache the first time by running:                      |"; \
--- 202,210 ----
  		echo "| You now have successfully built and installed the      |"; \
  		echo "| Apache 1.3 HTTP server. To verify that Apache actually |"; \
  		echo "| works correctly you now should first check the         |"; \
! 		echo "| (initially created or preserved) configuration file   |"; \
  		echo "|                                                        |"; \
! 		echo "|   $(sysconfdir)/$(TARGET).conf"; \
  		echo "|                                                        |"; \
  		echo "| and then you should be able to immediately fire up     |"; \
  		echo "| Apache the first time by running:                      |"; \
***************
*** 238,245 ****
  #   install the server program and optionally corresponding
  #   shared object files.
  install-programs:
! 	@echo "===> [programs: Installing Apache httpd program and shared objects]"
! 	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/httpd $(root)$(sbindir)/httpd
  	-@if [ ".`grep 'SUBTARGET=target_shared' $(TOP)/$(SRC)/Makefile`" != . ]; then \
  		SHLIB_SUFFIX_NAME="`grep '^SHLIB_SUFFIX_NAME=' $(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`";
\
  		SHLIB_SUFFIX_LIST="`grep '^SHLIB_SUFFIX_LIST=' $(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`";
\
--- 241,248 ----
  #   install the server program and optionally corresponding
  #   shared object files.
  install-programs:
! 	@echo "===> [programs: Installing Apache $(TARGET) program and shared objects]"
! 	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET)
  	-@if [ ".`grep 'SUBTARGET=target_shared' $(TOP)/$(SRC)/Makefile`" != . ]; then \
  		SHLIB_SUFFIX_NAME="`grep '^SHLIB_SUFFIX_NAME=' $(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`";
\
  		SHLIB_SUFFIX_LIST="`grep '^SHLIB_SUFFIX_LIST=' $(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`";
\
***************
*** 288,295 ****
  	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/ab $(root)$(sbindir)/ab
  	$(INSTALL_DATA) $(TOP)/$(SRC)/support/ab.1 $(root)$(mandir)/man1/ab.1
  	@echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/apachectl";
\
! 	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/httpd.pid;' \
! 		-e 's;HTTPD=.*;HTTPD=$(sbindir)/httpd;' \
  		< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp &&
\
  		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/apachectl
  	$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/apachectl.1
--- 291,298 ----
  	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/ab $(root)$(sbindir)/ab
  	$(INSTALL_DATA) $(TOP)/$(SRC)/support/ab.1 $(root)$(mandir)/man1/ab.1
  	@echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/apachectl";
\
! 	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
! 		-e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
  		< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp &&
\
  		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/apachectl
  	$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/apachectl.1
***************
*** 357,363 ****
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
!         		> $(TOP)/$(SRC)/.apaci.install.tmp; \
  			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}";
\
  			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script};
\
  		done; \
--- 360,366 ----
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
! 				> $(TOP)/$(SRC)/.apaci.install.tmp; \
  			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}";
\
  			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script};
\
  		done; \
***************
*** 372,413 ****
  #   create the initial configuration by providing default files
  #   and initial config files while preserving existing ones.
  install-config:
! 	@echo "===> [config: Installing Apache configuration files]"
! 	-@for conf in httpd.conf access.conf srm.conf; do \
! 		(echo "##"; \
! 		 echo "## $${conf} -- Apache HTTP server configuration file"; \
! 		 echo "##"; \
! 		 echo ""; \
! 		 cat $(TOP)/conf/$${conf}-dist ) |\
! 		 sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
! 			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
! 			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
! 			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
! 			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
! 			-e 's;@@ServerRoot@@;$(prefix);' \
! 			-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
! 			-e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
! 			-e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
! 			-e 's;logs/access_log;$(logfiledir)/access_log;' \
! 			-e 's;logs/error_log;$(logfiledir)/error_log;' \
! 			-e 's;logs/referer_log;$(logfiledir)/referer_log;' \
! 			-e 's;logs/agent_log;$(logfiledir)/agent_log;' \
! 			-e 's;conf/magic;$(sysconfdir)/magic;' \
! 			-e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
! 			-e 's;Group #-1;Group $(conf_group);' \
! 			-e 's;Port 80;Port $(conf_port);' \
! 			-e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
! 			-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
!         	> $(TOP)/$(SRC)/.apaci.install.tmp && \
! 		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default";
\
! 		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${conf}.default;
\
! 		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
! 			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}"; \
! 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${conf}; \
! 		else \
! 			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
! 		fi; \
! 	done
  	-@for conf in mime.types magic; do \
  		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
  		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
--- 375,414 ----
  #   create the initial configuration by providing default files
  #   and initial config files while preserving existing ones.
  install-config:
! 	@echo "===> [config: Installing Apache configuration file]"
! 	@(echo "##"; \
! 	 echo "## $${conf} -- Apache HTTP server configuration file"; \
! 	 echo "##"; \
! 	 echo ""; \
! 	 cat $(TOP)/conf/httpd.conf-dist ) |\
! 	 sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
! 		-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
! 		-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
! 		-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
! 		-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
! 		-e 's;@@ServerRoot@@;$(prefix);' \
! 		-e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \
! 		-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
! 		-e 's;logs/httpd.pid;$(runtimedir)/$(TARGET).pid;' \
! 		-e 's;logs/access_log;$(logfiledir)/$(TARGET).access_log;' \
! 		-e 's;logs/error_log;$(logfiledir)/$(TARGET).error_log;' \
! 		-e 's;logs/referer_log;$(logfiledir)/$(TARGET).referer_log;' \
! 		-e 's;logs/agent_log;$(logfiledir)/$(TARGET).agent_log;' \
! 		-e 's;conf/magic;$(sysconfdir)/magic;' \
! 		-e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
! 		-e 's;Group #-1;Group $(conf_group);' \
! 		-e 's;Port 80;Port $(conf_port);' \
! 		-e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
! 		-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
! 		> $(TOP)/$(SRC)/.apaci.install.tmp && \
! 	echo "$(INSTALL_DATA) $(TOP)/conf/httpd.conf-dist $(root)$(sysconfdir)/$(TARGET).conf.default";
\
! 	$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$(TARGET).conf.default;
\
! 	if [ ! -f "$(root)$(sysconfdir)/$(TARGET).conf" ]; then \
! 		echo "$(INSTALL_DATA) $(TOP)/conf/httpd.conf-dist $(root)$(sysconfdir)/$(TARGET).conf";
\
! 		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$(TARGET).conf;
\
! 	else \
! 		echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$(TARGET).conf]"; \
! 	fi;
  	-@for conf in mime.types magic; do \
  		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
  		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
Index: configure
===================================================================
RCS file: /usr/local/covalent/.CVS/apache/apache-1.3/configure,v
retrieving revision 1.50
diff -c -r1.50 configure
*** configure	1998/11/08 21:24:01	1.50
--- configure	1998/11/30 06:07:20
***************
*** 69,78 ****
  ##  the paths to the Apache source tree
  ##
  
! top=.
! mkf=Makefile
! src=src
! aux=src/helpers
  sedsubst=src/.apaci.sedsubst
  addconf=src/.apaci.addconf
  tplconf=src/.apaci.tplconf
--- 69,78 ----
  ##  the paths to the Apache source tree
  ##
  
! top=`pwd`;			export top
! mkf=Makefile;			export mkf
! src=src;			export src
! aux=src/helpers;		export aux
  sedsubst=src/.apaci.sedsubst
  addconf=src/.apaci.addconf
  tplconf=src/.apaci.tplconf
***************
*** 82,90 ****
  ##  pre-determine runtime modes
  ##
  
! help=no
! quiet=no
! verbose=no
  case "$*" in
      --help|*--help|*--help* ) help=yes; quiet=yes ;;
      --quiet|*--quiet|*--quiet* ) quiet=yes ;;
--- 82,90 ----
  ##  pre-determine runtime modes
  ##
  
! help=no;		export help
! quiet=no;		export quiet
! verbose=no;		export verbose
  case "$*" in
      --help|*--help|*--help* ) help=yes; quiet=yes ;;
      --quiet|*--quiet|*--quiet* ) quiet=yes ;;
***************
*** 122,128 ****
  PERL=no-perl-on-this-system
  perlpath="`$aux/PrintPath perl5 perl miniperl`"
  if [ ".$perlpath" != . ]; then
!     PERL="$perlpath"
  fi
  
  ##
--- 122,128 ----
  PERL=no-perl-on-this-system
  perlpath="`$aux/PrintPath perl5 perl miniperl`"
  if [ ".$perlpath" != . ]; then
!     PERL="$perlpath"; export PERL
  fi
  
  ##
***************
*** 165,183 ****
  ##
  
  #   default paths
! prefix='/usr/local/apache'
! exec_prefix='$prefix'
! bindir='$exec_prefix/bin'
! sbindir='$exec_prefix/sbin'
! libexecdir='$exec_prefix/libexec'
! mandir='$prefix/man'
! sysconfdir='$prefix/etc'
! datadir='$prefix/share'
! includedir='$prefix/include'
! localstatedir='$prefix/var'
! runtimedir='$localstatedir/run'
! logfiledir='$localstatedir/log'
! proxycachedir='$localstatedir/proxy'
  
  #   customization flags for
  #   automatic "apache" suffix 
--- 165,183 ----
  ##
  
  #   default paths
! prefix='/usr/local/apache';		export prefix
! exec_prefix='${prefix}';		export exec_prefix
! bindir='${exec_prefix}/bin';		export bindir
! sbindir='${exec_prefix}/bin';		export sbindir
! libexecdir='${exec_prefix}/libexec';	export libexecdir
! mandir='${prefix}/man';			export mandir
! sysconfdir='${prefix}/conf';		export sysconfdir
! datadir='${prefix}';			export datadir
! includedir='${prefix}/include';		export includedir
! localstatedir='${prefix}';		export localstatedir
! runtimedir='${localstatedir}/logs';	export runtimedir
! logfiledir='${localstatedir}/logs';	export logfiledir
! proxycachedir='${localstatedir}/proxy';	export proxycachedir
  
  #   customization flags for
  #   automatic "apache" suffix 
***************
*** 190,210 ****
  layout=0
  
  #   suexec defaults
! suexec=0
! suexec_ok=0
! suexec_docroot='$datadir/htdocs'
! suexec_logexec='$logfiledir/suexec_log'
! suexec_caller=www
! suexec_userdir=public_html
! suexec_uidmin=100
! suexec_gidmin=100
! suexec_safepath="/usr/local/bin:/usr/bin:/bin"
  
  #   with support tools
! support=1
  
  #   with adjustments
! confadjust=1
  
  #   module ordering
  permute=''
--- 190,210 ----
  layout=0
  
  #   suexec defaults
! suexec=0;				export suexec
! suexec_ok=0;				export suexec_ok
! suexec_docroot='$datadir/htdocs';	export suexec_docroot
! suexec_logexec='$logfiledir/suexec_log';	export suexec_logexec
! suexec_caller=www;			export suexec_caller
! suexec_userdir=public_html;		export suexec_userdir
! suexec_uidmin=100;			export suexec_uidmin
! suexec_gidmin=100;			export suexec_gidmin
! suexec_safepath="/usr/local/bin:/usr/bin:/bin";	export suexec_safepath
  
  #   with support tools
! support=1;			export support
  
  #   with adjustments
! confadjust=1;			export confadjust
  
  #   module ordering
  permute=''
***************
*** 407,413 ****
              echo " --runtimedir=DIR       install runtime data in DIR          [PREFIX/var/run]"
              echo " --logfiledir=DIR       install logfile data in DIR          [PREFIX/var/log]"
              echo " --proxycachedir=DIR    install proxy cache data in DIR      [PREFIX/var/proxy]"
!             echo " --compat               install with old Apache 1.2 installation paths"
              echo ""
              echo "Configuration options:"
              echo " --enable-rule=NAME     enable  a particular Rule named 'NAME'"
--- 407,413 ----
              echo " --runtimedir=DIR       install runtime data in DIR          [PREFIX/var/run]"
              echo " --logfiledir=DIR       install logfile data in DIR          [PREFIX/var/log]"
              echo " --proxycachedir=DIR    install proxy cache data in DIR      [PREFIX/var/proxy]"
!             echo " --GNU-paths            install with GNU installation paths"
              echo ""
              echo "Configuration options:"
              echo " --enable-rule=NAME     enable  a particular Rule named 'NAME'"
***************
*** 483,505 ****
          --proxycachedir=*) 
              proxycachedir="$apc_optarg" 
              ;;
!         --compat) 
              exec_prefix='$prefix'
              bindir='$exec_prefix/bin'
!             sbindir='$exec_prefix/bin'
              libexecdir='$exec_prefix/libexec'
              mandir='$prefix/man'
!             sysconfdir='$prefix/conf'
!             datadir='$prefix'
              includedir='$prefix/include'
!             localstatedir='$prefix'
!             runtimedir='$localstatedir/logs'
!             logfiledir='$localstatedir/logs'
              proxycachedir='$localstatedir/proxy'
!             customized_sysconfdir=1
!             customized_datadir=1
!             customized_localstatedir=1
!             customized_includedir=1
              ;;
          --add-module=*) 
              file="$apc_optarg"
--- 483,505 ----
          --proxycachedir=*) 
              proxycachedir="$apc_optarg" 
              ;;
!         --GNU-paths) 
              exec_prefix='$prefix'
              bindir='$exec_prefix/bin'
!             sbindir='$exec_prefix/sbin'
              libexecdir='$exec_prefix/libexec'
              mandir='$prefix/man'
!             sysconfdir='$prefix/etc'
!             datadir='$prefix/share'
              includedir='$prefix/include'
!             localstatedir='$prefix/var'
!             runtimedir='$localstatedir/run'
!             logfiledir='$localstatedir/log'
              proxycachedir='$localstatedir/proxy'
!             customized_sysconfdir=0
!             customized_datadir=0
!             customized_localstatedir=0
!             customized_includedir=0
              ;;
          --add-module=*) 
              file="$apc_optarg"
***************
*** 848,860 ****
    distclean_support=
  fi
  
  ##
  ##  determine special configuration parameters
  ##
! conf_group="#-1"
! conf_port="80"
! conf_serveradmin="you@your.address"
! conf_servername="new.host.name"
  if [ ".$confadjust" = .1 ]; then
      if [ ".`egrep '^nobody:' /etc/group`" != . ]; then
          conf_group="nobody"
--- 848,865 ----
    distclean_support=
  fi
  
+ export build_support
+ export install_support
+ export clean_support
+ export distclean_support
+ 
  ##
  ##  determine special configuration parameters
  ##
! conf_group="#-1";			export conf_group
! conf_port="80";				export conf_port
! conf_serveradmin="you@your.address";	export conf_serveradmin
! conf_servername="new.host.name";	export conf_servername
  if [ ".$confadjust" = .1 ]; then
      if [ ".`egrep '^nobody:' /etc/group`" != . ]; then
          conf_group="nobody"
***************
*** 866,873 ****
      if [ ".`id | grep root`" = . ]; then
          conf_port="8080"
      fi
!     conf_serveradmin="`$aux/buildinfo.sh -n %u@%h%d`"
!     conf_servername="`$aux/buildinfo.sh -n %h%d`"
  fi
   
  ##
--- 871,878 ----
      if [ ".`id | grep root`" = . ]; then
          conf_port="8080"
      fi
!     conf_serveradmin="`$aux/buildinfo.sh -n %u@%h%d`";	export conf_serveradmin
!     conf_servername="`$aux/buildinfo.sh -n %h%d`";	export conf_servername
  fi
   
  ##
***************
*** 931,979 ****
      fi
      exit 0
  fi
- 
- ##
- ##  create Makefile from Makefile.tmpl
- ##
- if [ .$quiet = .no ]; then
-     echo "Creating $mkf"
- fi
- sed <Makefile.tmpl >$mkf \
- -e "s%@PERL@%$PERL%g" \
- -e "s%@TOP@%$top%g" \
- -e "s%@SRC@%$src%g" \
- -e "s%@MKF@%$mkf%g" \
- -e "s%@AUX@%$aux%g" \
- -e "s%@prefix@%$prefix%g" \
- -e "s%@exec_prefix@%$exec_prefix%g" \
- -e "s%@bindir@%$bindir%g" \
- -e "s%@sbindir@%$sbindir%g" \
- -e "s%@libexecdir@%$libexecdir%g" \
- -e "s%@libexecdir_relative@%$libexecdir_relative%g" \
- -e "s%@mandir@%$mandir%g" \
- -e "s%@sysconfdir@%$sysconfdir%g" \
- -e "s%@datadir@%$datadir%g" \
- -e "s%@localstatedir@%$localstatedir%g" \
- -e "s%@includedir@%$includedir%g" \
- -e "s%@runtimedir@%$runtimedir%g" \
- -e "s%@logfiledir@%$logfiledir%g" \
- -e "s%@proxycachedir@%$proxycachedir%g" \
- -e "s%@suexec@%$suexec%g" \
- -e "s%@suexec_caller@%$suexec_caller%g" \
- -e "s%@suexec_docroot@%$suexec_docroot%g" \
- -e "s%@suexec_logexec@%$suexec_logexec%g" \
- -e "s%@suexec_userdir@%$suexec_userdir%g" \
- -e "s%@suexec_uidmin@%$suexec_uidmin%g" \
- -e "s%@suexec_gidmin@%$suexec_gidmin%g" \
- -e "s%@suexec_safepath@%$suexec_safepath%g" \
- -e "s%@conf_group@%$conf_group%g" \
- -e "s%@conf_port@%$conf_port%g" \
- -e "s%@conf_serveradmin@%$conf_serveradmin%g" \
- -e "s%@conf_servername@%$conf_servername%g" \
- -e "s%@build_support@%$build_support%g" \
- -e "s%@install_support@%$install_support%g" \
- -e "s%@clean_support@%$clean_support%g" \
- -e "s%@distclean_support@%$distclean_support%g"
  
  ##
  ##  override default paths in $src/include/httpd.h
--- 936,941 ----
Index: src/Configure
===================================================================
RCS file: /usr/local/covalent/.CVS/apache/apache-1.3/src/Configure,v
retrieving revision 1.306
diff -c -r1.306 Configure
*** Configure	1998/11/11 18:36:07	1.306
--- Configure	1998/11/30 06:30:32
***************
*** 1992,1994 ****
--- 1992,2146 ----
  
  done
  
+ ####################################################################
+ ## Now create toplevel Makefile
+ ##
+ [ -z ${top} ] && top=`pwd | sed -e 's%/src%%g`;	export top
+ [ -z ${mkf} ] && mkf=Makefile;			export mkf
+ [ -z ${src} ] && src=src;			export src
+ [ -z ${aux} ] && aux=src/helpers;		export aux
+ PERL=no-perl-on-this-system
+ perlpath="`helpers/PrintPath perl5 perl miniperl`"
+ if [ ".$perlpath" != . ]; then
+     PERL="$perlpath"; export PERL
+ fi
+ #   default paths
+ [ ".${prefix}" = . ] && \
+ 	prefix='/usr/local/apache';		export prefix
+ [ ".${exec_prefxi}" = . ] && \
+ 	exec_prefix='${prefix}';		export exec_prefix
+ [ ".${bindir}" = . ] && \
+ 	bindir='${exec_prefix}/bin';		export bindir
+ [ ".${sbindir}" = . ] && \
+ 	sbindir='${exec_prefix}/bin';		export sbindir
+ [ ".${libexecdir}" = . ] && \
+ 	libexecdir='${exec_prefix}/libexec';	export libexecdir
+ [ ".${mandir}" = . ] && \
+ 	mandir='${prefix}/man';			export mandir
+ [ ".${sysconfdir}" = . ] && \
+ 	sysconfdir='${prefix}/conf';		export sysconfdir
+ [ ".${datadir}" = . ] && \
+ 	datadir='${prefix}';			export datadir
+ [ ".${includedir}" = . ] && \
+ 	includedir='${prefix}/include';		export includedir
+ [ ".${localstatedir}" = . ] && \
+ 	localstatedir='${prefix}';		export localstatedir
+ [ ".${runtimedir}" = . ] && \
+ 	runtimedir='${localstatedir}/logs';	export runtimedir
+ [ ".${logfiledir}" = . ] && \
+ 	logfiledir='${localstatedir}/logs';	export logfiledir
+ [ ".${proxycachedir}" = . ] && \
+ 	proxycachedir='${localstatedir}/proxy'; export proxycachedir
+ #   suexec defaults
+ [ ".${suexec}" = . ] && \
+ 	suexec=0;				export suexec
+ [ ".${suexec_ok}" = . ] && \
+ 	suexec_ok=0;				export suexec_ok
+ [ ".${suexec_docroot}" = . ] && \
+ 	suexec_docroot='$datadir/htdocs';	export suexec_docroot
+ [ ".${suexec_logexec}" = . ] && \
+ 	suexec_logexec='$logfiledir/suexec_log';	export suexec_logexec
+ [ ".${suexec_caller}" = . ] && \
+ 	suexec_caller=www;			export suexec_caller
+ [ ".${suexec_userdir}" = . ] && \
+ 	suexec_userdir=public_html;		export suexec_userdir
+ [ ".${suexec_uidmin}" = . ] && \
+ 	suexec_uidmin=100;			export suexec_uidmin
+ [ ".${suexec_gidmin}" = . ] && \
+ 	suexec_gidmin=100;			export suexec_gidmin
+ [ ".${suexec_safepath}" = . ] && \
+ 	suexec_safepath="/usr/local/bin:/usr/bin:/bin";	export suexec_safepath
+ [ ".${support}" = . ] && \
+ 	support=1;				export support
+ [ ".${conf_group}" = . ] && \
+ 	conf_group="#-1";			export conf_group
+ [ ".${conf_port}" = . ] && \
+ 	conf_port="80";				export conf_port
+ [ ".${conf_serveradmin}" = . ] && \
+ 	conf_serveradmin="you@your.address";	export conf_serveradmin
+ [ ".${conf_servername}" = . ] && \
+ 	conf_servername="new.host.name";	export conf_servername
+ [ ".${conf_serveradmin}" = . ] && \
+ 	conf_serveradmin="`$top/$aux/buildinfo.sh -n %u@%h%d`"; \
+ 	export conf_serveradmin
+ [ ".${conf_servername}" = . ] && \
+ 	conf_servername="`$top/$aux/buildinfo.sh -n %h%d`"; \
+ 	export conf_servername
+ [ ".${confadjust}" = . ] && \
+ 	confadjust=1;				export confadjust
+ if [ ".$confadjust" = .1 ]; then
+     if [ ".`egrep '^nobody:' /etc/group`" != . ]; then
+         conf_group="nobody"
+     else
+         if [ ".`egrep '^nogroup:' /etc/group`" != . ]; then
+             conf_group="nogroup"
+         fi
+     fi
+     if [ ".`id | grep root`" = . ]; then
+         conf_port="8080"
+     fi
+     conf_serveradmin="`$top/$aux/buildinfo.sh -n %u@%h%d`"; \
+ 	export conf_serveradmin
+     conf_servername="`$top/$aux/buildinfo.sh -n %h%d`"; \
+ 	export conf_servername
+ fi
+ [ ".${support}" = . ] && \
+ 	support=1;				export support
+ if [ ".${support}" = .1 ]; then
+       build_support=build-support
+     install_support=install-support
+       clean_support=clean-support
+   distclean_support=distclean-support
+ else
+       build_support=
+     install_support=
+       clean_support=
+   distclean_support=
+ fi
+ 
+ export build_support
+ export install_support
+ export clean_support
+ export distclean_support
+ 
+ if [ .$quiet = .no ]; then
+     echo "Creating toplevel Makefile" 
+ fi 
+ 
+ sed <$top/$mkf.tmpl >$top/$mkf \
+     -e "s%@TARGET@%$TARGET%g" \
+     -e "s%@PERL@%$PERL%g" \
+     -e "s%@TOP@%$top%g" \
+     -e "s%@SRC@%$src%g" \
+     -e "s%@MKF@%$mkf%g" \
+     -e "s%@AUX@%$aux%g" \
+     -e "s%@prefix@%$prefix%g" \
+     -e "s%@exec_prefix@%$exec_prefix%g" \
+     -e "s%@bindir@%$bindir%g" \
+     -e "s%@sbindir@%$sbindir%g" \
+     -e "s%@libexecdir@%$libexecdir%g" \
+     -e "s%@libexecdir_relative@%$libexecdir_relative%g" \
+     -e "s%@mandir@%$mandir%g" \
+     -e "s%@sysconfdir@%$sysconfdir%g" \
+     -e "s%@datadir@%$datadir%g" \
+     -e "s%@localstatedir@%$localstatedir%g" \
+     -e "s%@includedir@%$includedir%g" \
+     -e "s%@runtimedir@%$runtimedir%g" \
+     -e "s%@logfiledir@%$logfiledir%g" \
+     -e "s%@proxycachedir@%$proxycachedir%g" \
+     -e "s%@suexec@%$suexec%g" \
+     -e "s%@suexec_caller@%$suexec_caller%g" \
+     -e "s%@suexec_docroot@%$suexec_docroot%g" \
+     -e "s%@suexec_logexec@%$suexec_logexec%g" \
+     -e "s%@suexec_userdir@%$suexec_userdir%g" \
+     -e "s%@suexec_uidmin@%$suexec_uidmin%g" \
+     -e "s%@suexec_gidmin@%$suexec_gidmin%g" \
+     -e "s%@suexec_safepath@%$suexec_safepath%g" \
+     -e "s%@conf_group@%$conf_group%g" \
+     -e "s%@conf_port@%$conf_port%g" \
+     -e "s%@conf_serveradmin@%$conf_serveradmin%g" \
+     -e "s%@conf_servername@%$conf_servername%g" \
+     -e "s%@build_support@%$build_support%g" \
+     -e "s%@install_support@%$install_support%g" \
+     -e "s%@clean_support@%$clean_support%g" \
+     -e "s%@distclean_support@%$distclean_support%g"

Mime
View raw message