brian 98/06/15 20:28:51
Modified: . Makefile.tmpl configure STATUS .cvsignore src CHANGES Log: Submitted by: Ralf S. Engelschall Reviewed by: Jim, Martin, Brian *) Add a tiny but useful goody to APACI's configure script: The generation of a config.status script (as GNU Autoconf does) which remembers the used configure command and hence can be used to restore the configuration by just re-running this script or for remembering the configuration between releases. Revision Changes Path 1.40 +1 -0 apache-1.3/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- Makefile.tmpl 1998/06/09 11:02:20 1.39 +++ Makefile.tmpl 1998/06/16 03:28:44 1.40 @@ -449,6 +449,7 @@ -$(RM) $(SRC)/apaci @$(RM) $(SRC)/.apaci.build.ok -$(RM) Makefile + -$(RM) config.status # clean the standard stuff distclean-std: 1.33 +38 -0 apache-1.3/configure Index: configure =================================================================== RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- configure 1998/06/13 11:24:10 1.32 +++ configure 1998/06/16 03:28:45 1.33 @@ -75,6 +75,7 @@ aux=src/helpers sedsubst=src/.apaci.sedsubst addconf=src/.apaci.addconf +configstatus=config.status ## ## pre-determine runtime modes @@ -237,6 +238,43 @@ fi done IFS="$OIFS" + +# create a config status script for restoring +# the configuration via a simple shell script +rm -f $configstatus 2>/dev/null +echo "#!/bin/sh" >$configstatus +echo "##" >>$configstatus +echo "## $configstatus -- APACI auto-generated configuration restore script" >>$configstatus +echo "##" >>$configstatus +echo "## Use this shell script to re-run the APACI configure script for" >>$configstatus +echo "## restoring your configuration. Additional parameters can be supplied." >>$configstatus +echo "##" >>$configstatus +echo "" >>$configstatus +for var in CC OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ + LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do + eval "val=\"\$$var\"" + if [ ".$val" != . ]; then + echo "$var=$val" |\ + sed -e 's:\(["$\\]\):\\\1:g' \ + -e 's:\([A-Z]*=\):\1":' \ + -e 's:$:" \\:' >>$configstatus + fi +done +if [ $# -eq 0 ]; then + echo "./configure" >>$configstatus +else + echo "./configure \\" >>$configstatus + for arg + do + echo "$arg" |\ + sed -e 's:\(["$\\]\):\\\1:g' \ + -e 's:^:":' \ + -e 's:$:" \\:' >>$configstatus + done +fi +echo '$*' >>$configstatus +echo '' >>$configstatus +chmod a+x $configstatus ## ## parse argument line options 1.427 +0 -6 apache-1.3/STATUS Index: STATUS =================================================================== RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.426 retrieving revision 1.427 diff -u -r1.426 -r1.427 --- STATUS 1998/06/16 03:24:03 1.426 +++ STATUS 1998/06/16 03:28:45 1.427 @@ -44,12 +44,6 @@ <[EMAIL PROTECTED]> Status: Ralf +1 - * Ralf's "configure generates config.status": - A tiny addition for the APACI configure script to provide an easy way - (like GNU Autoconf) to re-create the configuration - See: http://www.engelschall.com/sw/apache/ [configstatus] - Status (for 1.3.1-dev): Ralf +1, Martin +1, Jim +1 - * Ralf's "<IfDefine>...</IfDefine>": This patch adds a useful <IfDefine>...</IfDefine> section to the core module very similar to the existing <IfModule>...<IfModule> sections. 1.3 +1 -0 apache-1.3/.cvsignore Index: .cvsignore =================================================================== RCS file: /export/home/cvs/apache-1.3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1998/05/07 15:24:42 1.2 +++ .cvsignore 1998/06/16 03:28:45 1.3 @@ -1,3 +1,4 @@ Makefile +config.status Makefile.* src.* 1.918 +7 -0 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.917 retrieving revision 1.918 diff -u -r1.917 -r1.918 --- CHANGES 1998/06/15 16:49:11 1.917 +++ CHANGES 1998/06/16 03:28:50 1.918 @@ -22,6 +22,13 @@ in CPU time, instruction cache, and memory usage, particularly for large directories. [Ken Coar] + *) Add a tiny but useful goody to APACI's configure script: The generation + of a config.status script (as GNU Autoconf does) which remembers the used + configure command and hence can be used to restore the configuration by + just re-running this script or for remembering the configuration between + releases. + [Ralf S. Engelschall] + *) Add httpd -t (test) option for running configuration syntax tests only. If something is broken it complains and exits with a return code non-equal to 0. This can be used manually by the user to check the Apache