httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@gonzo.ben.algroup.co.uk>
Subject Re: SERVER_VERSION
Date Mon, 16 Dec 1996 23:00:05 GMT
Seems fine to me. +1.

Rob Hartill wrote:
> 
> 
> Ben Laurie wrote:
> 
> >Would't this be better done with an "extra" flag, as in
> >-DSERVER_SUBVERSION="mod_perl/0.85_04", and
> >
> >#define SERVER_BASEVERSION "Apache/1.2"
> >#ifdef SERVER_SUBVERSION
> >#define SERVER_VERSION	SERVER_BASEVERSION " " SERVER_SUBVERSION
> >#else
> >#define SERVER_VERSION	SERVER_BASEVERSION
> >#endif
> 
> 
> Everyone seemed happy with this, so can someone commit it please.
> 
> Now, any comments on yesterday's "Configure -make" proposal ?
> 
> 
> 
> Index: Configure
> ===================================================================
> RCS file: /export/home/cvs/apache/src/Configure,v
> retrieving revision 1.4
> diff -c -r1.4 Configure
> *** Configure   1996/12/12 01:28:24     1.4
> --- Configure   1996/12/16 00:47:37
> ***************
> *** 16,28 ****
>   
>   file=Configuration
>   tmpfile=htconf.$$
>   
> ! if [ "x$1" = "x-file" ] ; then
> !   echo "Using alternate config file $2"
> !   file=$2 
> ! else
> !   echo "Using '$file' as config file"
> ! fi
>   
>   if [ ! -r $file ]; then
>     echo "Can't see or read \"$file\""
> --- 16,35 ----
>   
>   file=Configuration
>   tmpfile=htconf.$$
> + makefile_tmpl=Makefile.tmpl
>   
> ! while [ "x$1" != "x" ]; do
> !   if [ "x$1" = "x-file" ] ; then
> !     shift 1; file=$1; shift 1
> !   elif [ "x$1" = "x-make" ] ; then
> !     shift 1; makefile_tmpl=$1; shift 1
> !   else
> !     echo "Ignoring command line option '$1'"
> !     shift 1
> !   fi
> ! done
> ! echo "Using config file: $file"
> ! echo "Using Makefile template file: $makefile_tmpl"
>   
>   if [ ! -r $file ]; then
>     echo "Can't see or read \"$file\""
> ***************
> *** 84,91 ****
>   #
>   # Add module set only
>   #
> ! awk >Makefile <$tmpfile '\
> !    BEGIN { print "# Makefile automatically generated from Makefile.tmpl"; \
>            print "# and configuration file by Apache config script. "; \
>            print "# Hand-edited changes will be lost if the config script"; \
>            print "# is re-run."; \
> --- 91,98 ----
>   #
>   # Add module set only
>   #
> ! awk -v make=$makefile_tmpl >Makefile <$tmpfile '\
> !    BEGIN { printf "# Makefile automatically generated from %s\n", make; \
>            print "# and configuration file by Apache config script. "; \
>            print "# Hand-edited changes will be lost if the config script"; \
>            print "# is re-run."; \
> ***************
> *** 485,489 ****
>   echo "#### End of Configure created section ####">> Makefile
>   echo >> Makefile
>   
> ! cat Makefile.tmpl >> Makefile
>   
> --- 492,496 ----
>   echo "#### End of Configure created section ####">> Makefile
>   echo >> Makefile
>   
> ! cat "$makefile_tmpl" >> Makefile
>   
> 

-- 
Ben Laurie                Phone: +44 (181) 994 6435  Email: ben@algroup.co.uk
Freelance Consultant and  Fax:   +44 (181) 994 6472
Technical Director        URL: http://www.algroup.co.uk/Apache-SSL
A.L. Digital Ltd,         Apache Group member (http://www.apache.org)
London, England.          Apache-SSL author

Mime
View raw message