httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3/src CHANGES
Date Mon, 27 Apr 1998 13:01:07 GMT
rse         98/04/27 06:01:07

  Modified:    .        STATUS INSTALL configure Makefile.tmpl
               src      CHANGES
  Log:
  Add three additional configure options (--runtimedir, --logfiledir,
  --proxycachedir) to provide the possibility to adjust paths more granular.
  This is especially important for package maintainers.
  
  Revision  Changes    Path
  1.336     +1 -0      apache-1.3/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.335
  retrieving revision 1.336
  diff -u -r1.335 -r1.336
  --- STATUS	1998/04/27 10:46:07	1.335
  +++ STATUS	1998/04/27 13:00:57	1.336
  @@ -71,6 +71,7 @@
       * Ralf's fix for SOCKS4 and adding of additional SOCKS5 support, PR#2140
       * Ralf's workaround for sed limitation in configure script, PR#2136
       * Ralf's support for making APACI install root overrideable by pkg authors
  +    * Ralf's more granular install paths: runtimedir, logfiledir, proxycachedir
   
   Available Patches:
   
  
  
  
  1.20      +15 -10    apache-1.3/INSTALL
  
  Index: INSTALL
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/INSTALL,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- INSTALL	1998/04/27 11:02:44	1.19
  +++ INSTALL	1998/04/27 13:00:58	1.20
  @@ -143,11 +143,13 @@
                                  [--mandir=DIR]         [--disable-module=NAME] 
                                  [--sysconfdir=DIR]     [--enable-shared=NAME]  
                                  [--datadir=DIR]        [--disable-shared=NAME] 
  -                               [--localstatedir=DIR]  
  -                               [--compat]             [--enable-suexec]     
  -                                                      [--suexec-caller=UID] 
  -                               [--with-perl=FILE]     [--suexec-userdir=DIR]
  -                               [--without-support]    
  +                               [--includedir=DIR]     
  +                               [--localstatedir=DIR]  [--enable-suexec]     
  +                               [--runtimedir=DIR]     [--suexec-caller=UID] 
  +                               [--logfiledir=DIR]     [--suexec-userdir=DIR]
  +                               [--proxycachedir=DIR] 
  +                               [--compat]             [--with-perl=FILE]   
  +                                                      [--without-support] 
   
        Use the CC, OPTIM, CFLAGS, INCLUDES, LDFLAGS, LIBS, CFLAGS_SHLIB,
        LDFLAGS_SHLIB, LDFLAGS_SHLIB_EXPORT and RANLIB environment variables to
  @@ -174,11 +176,14 @@
        PREFIX=/usr/local/apache and EPREFIX=PREFIX.
   
        Use the --bindir=DIR, --sbindir=DIR, --libexecdir=DIR, --mandir=DIR,
  -     --sysconfdir=DIR, --datadir=DIR and --localstatedir=DIR option to change
  -     the paths for particular subdirectories of the installation tree. Defaults
  -     are bindir=EPREFIX/bin, sbindir=EPREFIX/sbin, libexecdir=EPREFIX/libexec,
  -     mandir=PREFIX/man, sysconfdir=PREFIX/etc, datadir=PREFIX/share and
  -     localstatedir=PREFIX/var.
  +     --sysconfdir=DIR, --datadir=DIR, --includedir=DIR, --localstatedir=DIR,
  +     --runtimedir=DIR, --logfiledir=DIR and proxycachedir=DIR option to change
  +     the paths for particular subdirectories of the installation tree.
  +     Defaults are bindir=EPREFIX/bin, sbindir=EPREFIX/sbin,
  +     libexecdir=EPREFIX/libexec, mandir=PREFIX/man, sysconfdir=PREFIX/etc,
  +     datadir=PREFIX/share, includedir=PREFIX/include,
  +     localstatedir=PREFIX/var, runtimedir=PREFIX/var/run,
  +     logfiledir=PREFIX/var/log and proxycachedir=PREFIX/var/proxy.
   
        Use the --compat option to install Apache into a installation tree which
        has a similar layout than the one used with Apache 1.2.
  
  
  
  1.22      +46 -26    apache-1.3/configure
  
  Index: configure
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/configure,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- configure	1998/04/27 10:46:08	1.21
  +++ configure	1998/04/27 13:00:59	1.22
  @@ -147,10 +147,11 @@
   mandir='$prefix/man'
   sysconfdir='$prefix/etc'
   datadir='$prefix/share'
  -localstatedir='$prefix/var'
  -localstatesubdir_run='run'
  -localstatesubdir_logs='logs'
   includedir='$prefix/include'
  +localstatedir='$prefix/var'
  +runtimedir='$localstatedir/run'
  +logfiledir='$localstatedir/log'
  +proxycachedir='$localstatedir/proxy'
   
   #   customization flags for
   #   automatic "apache" suffix 
  @@ -314,8 +315,11 @@
               echo " --mandir=DIR           install manual pages in DIR          [PREFIX/man]"
               echo " --sysconfdir=DIR       install configuration files in DIR   [PREFIX/etc]"
               echo " --datadir=DIR          install read-only  data files in DIR [PREFIX/share]"
  -            echo " --localstatedir=DIR    install modifiable data files in DIR [PREFIX/var]"
               echo " --includedir=DIR       install includes files in DIR        [PREFIX/include]"
  +            echo " --localstatedir=DIR    install modifiable data files in DIR [PREFIX/var]"
  +            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:"
  @@ -368,13 +372,22 @@
               datadir="$apc_optarg"       
               customized_datadir=1
               ;;
  +        --includedir=*)       
  +            includedir="$apc_optarg"       
  +            customized_includedir=1
  +            ;;
           --localstatedir=*) 
               localstatedir="$apc_optarg" 
               customized_localstatedir=1
               ;;
  -        --includedir=*)       
  -            includedir="$apc_optarg"       
  -            customized_includedir=1
  +        --runtimedir=*) 
  +            runtimedir="$apc_optarg" 
  +            ;;
  +        --logfiledir=*) 
  +            logfiledir="$apc_optarg" 
  +            ;;
  +        --proxycachedir=*) 
  +            proxycachedir="$apc_optarg" 
               ;;
           --compat) 
               exec_prefix='$prefix'
  @@ -384,10 +397,11 @@
               mandir='$prefix/man'
               sysconfdir='$prefix/conf'
               datadir='$prefix'
  -            localstatedir='$prefix'
  -            localstatesubdir_run='logs'
  -            localstatesubdir_logs='logs'
               includedir='$prefix/include'
  +            localstatedir='$prefix'
  +            runtimedir='$localstatedir/logs'
  +            logfiledir='$localstatedir/logs'
  +            proxycachedir='$localstatedir/proxy'
               customized_sysconfdir=1
               customized_datadir=1
               customized_localstatedir=1
  @@ -643,7 +657,8 @@
   OIFS="$IFS" IFS="$DIFS"
   for var in prefix exec_prefix bindir sbindir \
              libexecdir mandir sysconfdir datadir \
  -           localstatedir includedir; do
  +           includedir localstatedir runtimedir \
  +           logfiledir proxycachedir; do
       eval "val=\"\$$var\"";
       val=`echo $val | sed -e 's:/*$::'`
       eval "$var=\"$val\""
  @@ -687,9 +702,10 @@
   ##   or we cannot support the case where the relative
   ##   path is just the emtpy one, i.e. ""]
   ##
  -localstatedir_relative=`echo $localstatedir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
  +runtimedir_relative=`echo $runtimedir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
  +logfiledir_relative=`echo $logfiledir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
   sysconfdir_relative=`echo $sysconfdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
  -libexecdir_relative=`echo $libexecdir | sed -e "s:^$exec_prefix/*::" -e 's:\(.\)$:\1/:'`
  +libexecdir_relative=`echo $libexecdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
   
   ##
   ##  check and debug
  @@ -705,18 +721,21 @@
       echo "               mandir: $mandir" 
       echo "           sysconfdir: $sysconfdir" 
       echo "              datadir: $datadir" 
  -    echo "        localstatedir: $localstatedir" 
       echo "           includedir: $includedir" 
  +    echo "        localstatedir: $localstatedir" 
  +    echo "           runtimedir: $runtimedir" 
  +    echo "           logfiledir: $logfiledir" 
  +    echo "        proxycachedir: $proxycachedir" 
       echo ""
       echo "Compilation paths:"
       echo "           HTTPD_ROOT: $prefix"
       echo "           SUEXEC_BIN: $sbindir/suexec"
       echo "      SHARED_CORE_DIR: $libexecdir"
  -    echo "       DEFAULT_PIDLOG: ${localstatedir_relative}${localstatesubdir_run}/httpd.pid"
  -    echo "   DEFAULT_SCOREBOARD: ${localstatedir_relative}${localstatesubdir_run}/httpd.scoreboard"
  -    echo "     DEFAULT_LOCKFILE: ${localstatedir_relative}${localstatesubdir_run}/httpd.lock"
  -    echo "      DEFAULT_XFERLOG: ${localstatedir_relative}${localstatesubdir_logs}/access_log"
  -    echo "     DEFAULT_ERRORLOG: ${localstatedir_relative}${localstatesubdir_logs}/error_log"
  +    echo "       DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
  +    echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
  +    echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
  +    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
  +    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
       echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
       echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
       echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
  @@ -747,9 +766,10 @@
   -e "s%@sysconfdir@%$sysconfdir%g" \
   -e "s%@datadir@%$datadir%g" \
   -e "s%@localstatedir@%$localstatedir%g" \
  --e "s%@localstatesubdir_run@%$localstatesubdir_run%g" \
  --e "s%@localstatesubdir_logs@%$localstatesubdir_logs%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_userdir@%$suexec_userdir%g" \
  @@ -769,11 +789,11 @@
   echo "echo '-DHTTPD_ROOT=\"$prefix\"'" >>$src/apaci
   echo "echo '-DSUEXEC_BIN=\"$sbindir/suexec\"'" >>$src/apaci
   echo "echo '-DSHARED_CORE_DIR=\"$libexecdir\"'" >>$src/apaci
  -echo "echo '-DDEFAULT_PIDLOG=\"${localstatedir_relative}${localstatesubdir_run}/httpd.pid\"'"
>>$src/apaci
  -echo "echo '-DDEFAULT_SCOREBOARD=\"${localstatedir_relative}${localstatesubdir_run}/httpd.scoreboard\"'"
>>$src/apaci
  -echo "echo '-DDEFAULT_LOCKFILE=\"${localstatedir_relative}${localstatesubdir_run}/httpd.lock\"'"
>>$src/apaci
  -echo "echo '-DDEFAULT_XFERLOG=\"${localstatedir_relative}${localstatesubdir_logs}/access_log\"'"
>>$src/apaci
  -echo "echo '-DDEFAULT_ERRORLOG=\"${localstatedir_relative}${localstatesubdir_logs}/error_log\"'"
>>$src/apaci
  +echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
  +echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
  +echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
  +echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
  +echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
   echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
   echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
   echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
  
  
  
  1.29      +14 -13    apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Makefile.tmpl	1998/04/27 10:46:08	1.28
  +++ Makefile.tmpl	1998/04/27 13:01:00	1.29
  @@ -102,12 +102,13 @@
   mandir          = @mandir@
   sysconfdir      = @sysconfdir@
   datadir         = @datadir@
  -localstatedir   = @localstatedir@
   includedir      = @includedir@
  +localstatedir   = @localstatedir@
  +runtimedir      = @runtimedir@
  +logfiledir      = @logfiledir@
  +proxycachedir   = @proxycachedir@
   
   libexecdir_relative   = @libexecdir_relative@
  -localstatesubdir_run  = @localstatesubdir_run@
  -localstatesubdir_logs = @localstatesubdir_logs@
   
   #   suexec details (optional)
   suexec          = @suexec@
  @@ -221,10 +222,10 @@
   	$(MKDIR) $(root)$(datadir)/htdocs
   	$(MKDIR) $(root)$(datadir)/icons
   	$(MKDIR) $(root)$(datadir)/cgi-bin
  -	$(MKDIR) $(root)$(localstatedir)/$(localstatesubdir_logs)
  -	$(MKDIR) $(root)$(localstatedir)/$(localstatesubdir_run)
  -	$(MKDIR) $(root)$(localstatedir)/proxy
   	$(MKDIR) $(root)$(includedir)
  +	$(MKDIR) $(root)$(runtimedir)
  +	$(MKDIR) $(root)$(logfiledir)
  +	$(MKDIR) $(root)$(proxycachedir)
   	@echo "<=== [mktree]"
   
   #   install the server program and optionally corresponding
  @@ -272,7 +273,7 @@
   	$(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=$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
  +	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
  @@ -365,13 +366,13 @@
   			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
   			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
   			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
  -			-e 's;@@ServerRoot@@/proxy;$(localstatedir)/proxy;' \
  +			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
   			-e 's;@@ServerRoot@@;$(prefix);' \
  -			-e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
  -			-e 's;logs/apache_runtime_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;'
\
  -			-e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
  -			-e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
  -			-e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
  +			-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;conf/magic;$(sysconfdir)/magic;' \
           	> $(TOP)/$(SRC)/.apaci.install.tmp && \
   		echo "$(INSTALL_DATA) $(TOP)/conf/$$conf-dist[*] $(root)$(sysconfdir)/$$conf.default";
\
  
  
  
  1.799     +10 -0     apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.798
  retrieving revision 1.799
  diff -u -r1.798 -r1.799
  --- CHANGES	1998/04/27 10:46:09	1.798
  +++ CHANGES	1998/04/27 13:01:05	1.799
  @@ -1,5 +1,15 @@
   Changes with Apache 1.3b7
   
  +  *) Just having APACI's localstatedir is too general and not enough for most
  +     of the systems. 1.3b6 again required manual APACI patches by package
  +     maintainers from RedHat and FreeBSD because for their filesystem layout a
  +     little bit more flexibility in configuring the paths is needed. Hence we
  +     provide three additional configure options (--runtimedir, --logfiledir,
  +     --proxycachedir) which now can be used for more granular adjustments if
  +     --localstatedir is not enough to fit the particular needs. As a nice
  +     side-effect this reduces some subdir fiddling in configure+Makefile.tmpl.
  +     [Ralf S. Engelschall]
  +
     *) Make the install root for "make install" in APACI's Makefile overrideable
        by package authors.  This way we are even more friendly to package
        maintainers (especially Debian and RedHat) who build for the real prefix
  
  
  

Mime
View raw message