Return-Path: Delivered-To: apache-cvs-archive@hyperreal.org Received: (qmail 16702 invoked by uid 6000); 2 Dec 1998 09:09:20 -0000 Received: (qmail 16695 invoked by alias); 2 Dec 1998 09:09:18 -0000 Delivered-To: apache-1.3-cvs@hyperreal.org Received: (qmail 16691 invoked by uid 168); 2 Dec 1998 09:09:18 -0000 Date: 2 Dec 1998 09:09:18 -0000 Message-ID: <19981202090918.16690.qmail@hyperreal.org> From: rse@hyperreal.org To: apache-1.3-cvs@hyperreal.org Subject: cvs commit: apache-1.3 INSTALL configure Sender: apache-cvs-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org rse 98/12/02 01:09:17 Modified: . INSTALL configure Log: Some cleanups and documentation updates after Randy's recent commits. Revision Changes Path 1.47 +22 -16 apache-1.3/INSTALL Index: INSTALL =================================================================== RCS file: /home/cvs/apache-1.3/INSTALL,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- INSTALL 1998/11/12 20:15:48 1.46 +++ INSTALL 1998/12/02 09:09:16 1.47 @@ -135,27 +135,27 @@ Reference: - $ [CC=...] [CFLAGS_SHLIB=...] + $ [CC=...] [CFLAGS_SHLIB=...] [TARGET=...] [OPTIM=...] [LD_SHLIB=...] [CFLAGS=...] [LDFLAGS_SHLIB=...] [INCLUDES=...] [LDFLAGS_SHLIB_EXPORT=...] [LDFLAGS=...] [RANLIB=...] - [LIBS=...] + [LIBS=...] [DEPS=...] ./configure [--quiet] [--prefix=DIR] [--enable-rule=NAME] [--verbose] [--exec-prefix=PREFIX] [--disable-rule=NAME] [--shadow] [--bindir=EPREFIX] [--add-module=FILE] [--help] [--sbindir=DIR] [--activate-module=FILE] - [--layout] [--libexecdir=DIR] [--enable-module=NAME] + [--libexecdir=DIR] [--enable-module=NAME] [--mandir=DIR] [--disable-module=NAME] [--sysconfdir=DIR] [--enable-shared=NAME] [--datadir=DIR] [--disable-shared=NAME] [--includedir=DIR] [--permute-module=N1:N2] - [--localstatedir=DIR] - [--runtimedir=DIR] [--enable-suexec] - [--logfiledir=DIR] [--suexec-caller=UID] + [--localstatedir=DIR] + [--runtimedir=DIR] [--enable-suexec] + [--logfiledir=DIR] [--suexec-caller=UID] [--proxycachedir=DIR] [--suexec-docroot=DIR] - [--compat] [--suexec-logfile=FILE] - [--suexec-userdir=DIR] + [--with-layout=[F:]ID] [--suexec-logfile=FILE] + [--show-layout] [--suexec-userdir=DIR] [--suexec-uidmin=UID] [--suexec-gidmin=GID] [--suexec-safepath=PATH] @@ -165,10 +165,10 @@ [--without-confadjust] Use the CC, OPTIM, CFLAGS, INCLUDES, LDFLAGS, LIBS, CFLAGS_SHLIB, - LD_SHLIB, LDFLAGS_SHLIB, LDFLAGS_SHLIB_EXPORT and RANLIB environment - variables to override the corresponding default entries in the - src/Configuration.tmpl file (see there for more information about their - usage). + LD_SHLIB, LDFLAGS_SHLIB, LDFLAGS_SHLIB_EXPORT, RANLIB, DEPS and TARGET + environment variables to override the corresponding default entries in + the src/Configuration.tmpl file (see there for more information about + their usage). Note: The syntax ``KEY=VALUE ./configure ...'' (one single line!) is the GNU Autoconf compatible way of specifying defines and can @@ -216,11 +216,17 @@ make sure the paths fit your situation by checking the finally chosen paths via the --layout option. - Use the --compat option to install Apache into a installation tree which - has a similar layout than the one used with Apache 1.2. + Use the --with-layout=[F:]ID option to select a particular installation + path base-layout. You always _HAVE_ to select a base-layout. There are + currently two layouts pre-defined in the file config.layout: `Apache' for + the classical Apache path layout and `GNU' for a path layout conforming + to the GNU `standards' document. When you want to use your own custom + layout FOO, either add a corresponding "..." section + to config.layout and use --with-layout=FOO or place it into your own + file, say config.mypaths, and use --with-layout=config.mypaths:FOO. - Use the --layout option to check the final installation path layout while - fiddling with the options above. + Use the --show-layout option to check the final installation path layout + while fiddling with the options above. Use the --enable-rule=NAME and --disable-rule=NAME options to enable or disable a particular Rule from the Apache src/Configuration.tmpl file. The 1.54 +12 -12 apache-1.3/configure Index: configure =================================================================== RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- configure 1998/12/02 08:34:19 1.53 +++ configure 1998/12/02 09:09:16 1.54 @@ -388,7 +388,6 @@ echo "Stand-alone options:" echo " --help, -h print this message" echo " --show-layout print installation path layout (check and debug)" - echo " --layout backward compat use --show-layout" echo "" echo "Installation layout options:" echo " --with-layout=[F:]ID use installation path layout ID (from file F)" @@ -406,7 +405,6 @@ echo " --runtimedir=DIR install runtime data in DIR" echo " --logfiledir=DIR install logfile data in DIR" echo " --proxycachedir=DIR install proxy cache data in DIR" - echo " --compat backward compat use --with-layout=Apache" echo "" echo "Configuration options:" echo " --enable-rule=NAME enable a particular Rule named 'NAME'" @@ -434,21 +432,23 @@ echo " --suexec-gidmin=GID set the suEXEC minimal allowed GID [$suexec_gidmin]" echo " --suexec-safepath=PATH set the suEXEC safe PATH [$suexec_safepath]" echo "" + echo "Deprecated options:" + echo " --layout backward compat only: use --show-layout" + echo " --compat backward compat only: use --with-layout=Apache" exit 0 ;; --with-layout=*|--compat) + if [ ".$apc_option" = ".--compat" ]; then + apc_optarg="Apache" + fi case $apc_optarg in *:* ) file=`echo $apc_optarg | sed -e 's/:.*//'` name=`echo $apc_optarg | sed -e 's/.*://'` ;; * ) - if [ ".$apc_option" = ".--compat" ]; then - name=Apache - else - name=$apc_optarg - fi - file=$configlayout + name=$apc_optarg + file=$configlayout ;; esac if [ ! -f "$file" ]; then @@ -457,9 +457,9 @@ fi sed -e "1,/[ ]*<[Ll]ayout[ ]*$name[ ]*>[ ]*/d" \ -e '/[ ]*<\/Layout>[ ]*/,$d' \ - -e "s/^[ ]*//g" \ - -e "s/:[ ]*/=\'/g" \ - -e "s/[ ]*$/'/g" \ + -e "s/^[ ]*//g" \ + -e "s/:[ ]*/=\'/g" \ + -e "s/[ ]*$/'/g" \ $file >$pldconf . $pldconf rm -f $pldconf 2>/dev/null @@ -472,7 +472,7 @@ fi with_layout=1 ;; - --layout|--show-layout) + --show-layout|--layout) show_layout=1 ;; --target=*)