cvs commit: apache-1.3 configure
rse 00/02/05 01:57:16 Modified:.configure Log: Fix usage: it's '#-1' and not just '-1' Revision ChangesPath 1.118 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- configure 2000/02/04 23:09:52 1.117 +++ configure 2000/02/05 09:57:15 1.118 @@ -444,7 +444,7 @@ echo --without-confadjust disable the user/situation adjustments in config echo --without-execstripdisable the stripping of executables on installation echo --server-uid=UID set the user ID the web server should run as [nobody] -echo --server-gid=GID set the group ID the web server UID is a memeber of [-1] +echo --server-gid=GID set the group ID the web server UID is a memeber of [#-1] echo echo suEXEC options: echo --enable-suexecenable the suEXEC feature
cvs commit: apache-1.3 configure
lars00/02/04 15:09:54 Modified:.configure Log: add --iconsdir, --htdocsdir and --cgidir to Usage output Revision ChangesPath 1.117 +4 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- configure 2000/01/17 22:53:17 1.116 +++ configure 2000/02/04 23:09:52 1.117 @@ -416,7 +416,10 @@ echo --libexecdir=DIR install program executables in DIR echo --mandir=DIR install manual pages in DIR echo --sysconfdir=DIR install configuration files in DIR -echo --datadir=DIR install read-only data files in DIR +echo --datadir=DIR install read-only data files in DIR +echo --iconsdir=DIR install read-only icon files in DIR +echo --htdocsdir=DIRinstall read-only document files in DIR +echo --cgidir=DIR install read-only cgi files in DIR echo --includedir=DIR install includes files in DIR echo --localstatedir=DIRinstall modifiable data files in DIR echo --runtimedir=DIR install runtime data in DIR
cvs commit: apache-1.3 configure
wsanchez00/01/17 14:53:19
Modified:.configure
Log:
Fix misplacement of MPE/iX overrides.
Submitted by: [EMAIL PROTECTED]
Reviewed by: wsanchez
Revision ChangesPath
1.116 +5 -4 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- configure 2000/01/11 19:47:42 1.115
+++ configure 2000/01/17 22:53:17 1.116
@@ -339,7 +339,11 @@
iflags_program=${iflags_program} -e .exe
iflags_core=${iflags_core} -e .exe
;;
- *)
+*MPE/iX* )
+ default_layout=Apache
+ iflags_program=-m 755
+ ;;
+*)
default_layout=Apache
;;
esac
@@ -357,9 +361,6 @@
set -- --with-layout=$default_layout $@
fi
;;
-*MPE/iX* )
- iflags_program=-m 755
- ;;
esac
##
cvs commit: apache-1.3 configure
bjh 99/12/07 06:15:03
Modified:.configure
Log:
Give OS/2 back a default layout, disabled by previous patch.
Revision ChangesPath
1.112 +1 -0 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- configure 1999/12/04 00:59:52 1.111
+++ configure 1999/12/07 14:14:59 1.112
@@ -322,6 +322,7 @@
iflags_dso=${iflags_dso} -S \-S\
;;
*OS/2* )
+default_layout=Apache
iflags_program=${iflags_program} -e .exe
iflags_core=${iflags_core} -e .exe
;;
cvs commit: apache-1.3 configure
wsanchez99/12/03 16:59:57
Modified:.configure
Log:
Try to keep the platform overrides in one place for sanity.
Revision ChangesPath
1.111 +4 -6 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- configure 1999/11/28 14:15:35 1.110
+++ configure 1999/12/04 00:59:52 1.111
@@ -236,12 +236,6 @@
iflags_dso=-m 755
iflags_script=-m 755
iflags_data=-m 644
-case $PLATFORM in
-*OS/2* )
-iflags_program=$iflags_program -e .exe
-iflags_core=$iflags_core -e .exe
-;;
-esac
# various other flags
support=1
@@ -327,6 +321,10 @@
iflags_core=${iflags_core} -S \-S\
iflags_dso=${iflags_dso} -S \-S\
;;
+*OS/2* )
+iflags_program=${iflags_program} -e .exe
+iflags_core=${iflags_core} -e .exe
+;;
*)
default_layout=Apache
;;
cvs commit: apache-1.3 configure
rse 99/11/28 03:10:53 Modified:src CHANGES .configure Log: Made `tr' usage in top-level configure script more portable by always using square brackets consistently. Submitted by: Masashi Kizaki [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 5230 Revision ChangesPath 1.1447+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1446 retrieving revision 1.1447 diff -u -r1.1446 -r1.1447 --- CHANGES 1999/11/28 10:55:28 1.1446 +++ CHANGES 1999/11/28 11:10:48 1.1447 @@ -1,4 +1,8 @@ Changes with Apache 1.3.10 + + *) Made `tr' usage in top-level configure script more portable + by always using square brackets consistently. + [Masashi Kizaki [EMAIL PROTECTED]] PR#5230 *) Fixed ap_config_auto.h generation in src/Configure: there for the ``quad integer'' stuff ``#ifndef+#undef+#endif'' pairs were generated instead of 1.107 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- configure 1999/11/17 19:12:45 1.106 +++ configure 1999/11/28 11:10:52 1.107 @@ -257,7 +257,7 @@ for rule in `grep '^Rule' $src/Configuration.tmpl`; do rule=`echo $rule | sed -e 's/^Rule[]*//'` name=`echo $rule | sed -e 's/=.*$//'` -namelow=`echo $name | tr 'A-Z' 'a-z'` +namelow=`echo $name | tr '[A-Z]' '[a-z]'` arg=`echo $rule | sed -e 's/^.*=//'` eval rule_$namelow=$arg rules=$rules:$namelow
cvs commit: apache-1.3 configure
rse 99/11/28 03:17:58 Modified:src CHANGES .configure Log: Made stripping of a trailing slash in directory names in top-level configure script more robust and this way support also a plain `/' as the argument without resulting in an empty name. PR: 5291 Revision ChangesPath 1.1448+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1447 retrieving revision 1.1448 diff -u -r1.1447 -r1.1448 --- CHANGES 1999/11/28 11:10:48 1.1447 +++ CHANGES 1999/11/28 11:17:50 1.1448 @@ -1,4 +1,9 @@ Changes with Apache 1.3.10 + + *) Made stripping of a trailing slash in directory names in top-level + configure script more robust and this way support also a plain `/' + as the argument without resulting in an empty name. + [Matthias Lohmann [EMAIL PROTECTED]] PR#5291 *) Made `tr' usage in top-level configure script more portable by always using square brackets consistently. 1.108 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- configure 1999/11/28 11:10:52 1.107 +++ configure 1999/11/28 11:17:57 1.108 @@ -1038,7 +1038,7 @@ localstatedir runtimedir logfiledir proxycachedir \ suexec_docroot suexec_logexec; do eval val=\\$$var\; -val=`echo $val | sed -e 's:/*$::'` +val=`echo $val | sed -e 's:\(.\)/*$:\1:'` eval $var=\$val\ # expand value eval val=\$$var
cvs commit: apache-1.3 configure
rse 99/11/28 06:15:37 Modified:src CHANGES .configure Log: Add --iconsdir, --htdocsdir, and --cgidir option to top-level configure script to allow one to override the corresponding variables from config.layout. Revision ChangesPath 1.1461+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1460 retrieving revision 1.1461 diff -u -r1.1460 -r1.1461 --- CHANGES 1999/11/28 13:51:49 1.1460 +++ CHANGES 1999/11/28 14:15:32 1.1461 @@ -1,5 +1,10 @@ Changes with Apache 1.3.10 + *) Add --iconsdir, --htdocsdir, and --cgidir option to top-level + configure script to allow one to override the corresponding + variables from config.layout. + [Ralf S. Engelschall] + *) Fixed `quad integer' (aka `long long') handling in ap_snprintf.c [Ralf S. Engelschall] 1.110 +12 -0 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- configure 1999/11/28 11:36:53 1.109 +++ configure 1999/11/28 14:15:35 1.110 @@ -628,6 +628,18 @@ datadir=$apc_optarg autosuffix_datadir=no ;; +--iconsdir=*) +iconsdir=$apc_optarg +autosuffix_iconsdir=no +;; +--htdocsdir=*) +htdocsdir=$apc_optarg +autosuffix_htdocsdir=no +;; +--cgidir=*) +cgidir=$apc_optarg +autosuffix_cgidir=no +;; --includedir=*) includedir=$apc_optarg autosuffix_includedir=no
cvs commit: apache-1.3 configure
wsanchez99/11/17 11:12:54 Modified:.configure Log: Remove gratuitous print od --with-port setting. Revision ChangesPath 1.106 +0 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- configure 1999/11/17 02:24:55 1.105 +++ configure 1999/11/17 19:12:45 1.106 @@ -904,7 +904,6 @@ PERL=$apc_optarg ;; --with-port=*) -echo Using port $apc_optarg port=$apc_optarg ;; --without-support)
cvs commit: apache-1.3 configure
martin 99/10/05 07:46:04 Modified:.configure Log: If none of the standard group names was found in /etc/group, configure would generate a line like conf_group = #-1 in the Makefile. But as this is an empty assignment (# is the comment start), the resulting httpd.conf was unusable. Set the group to #-1 instead. Revision ChangesPath 1.104 +1 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- configure 1999/09/09 20:14:29 1.103 +++ configure 1999/10/05 14:46:02 1.104 @@ -1084,7 +1084,7 @@ ## UID/GID as production oriented as a web server in NIS anyway. ## conf_user=nobody -conf_group=#-1 +conf_group=#-1 conf_port=80 conf_serveradmin=[EMAIL PROTECTED] conf_servername=new.host.name
cvs commit: apache-1.3 configure
rse 99/08/12 23:36:16 Modified:src CHANGES .configure Log: Fixed generated AddModule adjustments in APACI's `configure' script in order to allow (new) modules like mod_vhost_alias to be handled correctly (which was touched by the adjustments for mod_alias). Revision ChangesPath 1.1418+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1417 retrieving revision 1.1418 diff -u -r1.1417 -r1.1418 --- CHANGES 1999/08/13 03:26:21 1.1417 +++ CHANGES 1999/08/13 06:36:14 1.1418 @@ -1,5 +1,10 @@ Changes with Apache 1.3.9 + *) Fixed generated AddModule adjustments in APACI's `configure' script in + order to allow (new) modules like mod_vhost_alias to be handled correctly + (which was touched by the adjustments for mod_alias). + [Ralf S. Engelschall] + *) For binary builds, add -R flag to apachectl to work around the lack of an absolute path to the ./libexec directory where libhttp.ep file is needed for SHARED_CORE architectures. 1.100 +11 -5 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- configure 1999/08/12 13:39:33 1.99 +++ configure 1999/08/13 06:36:16 1.100 @@ -1393,22 +1393,28 @@ fi # generate module directives +# (paths are modules/foo/mod_bar.ext and modules/foo/libbar.ext) OIFS=$IFS IFS=':' for module in $modules; do eval add=\$module_$module if [ x$add = xyes ]; then -echo $SEO s%^.*\\(AddModule.*[_b/]$module\\..*\\)%\\1%g $sedsubst -echo $SEO s%^.*\\(SharedModule.*[_b/]$module\\..*\\)%\\1%g $sedsubst +echo $SEO s%^.*\\(AddModule.*mod_$module\\..*\\)%\\1%g $sedsubst +echo $SEO s%^.*\\(AddModule.*lib$module\\..*\\)%\\1%g $sedsubst +echo $SEO s%^.*\\(SharedModule.*mod_$module\\..*\\)%\\1%g $sedsubst +echo $SEO s%^.*\\(SharedModule.*lib$module\\..*\\)%\\1%g $sedsubst m=yes else -echo $SEO s%^.*\\(AddModule.*[_b/]$module\\..*\\)%# \\1%g $sedsubst -echo $SEO s%^.*\\(SharedModule.*[_b/]$module\\..*\\)%# \\1%g $sedsubst +echo $SEO s%^.*\\(AddModule.*mod_$module\\..*\\)%# \\1%g $sedsubst +echo $SEO s%^.*\\(AddModule.*lib$module\\..*\\)%# \\1%g $sedsubst +echo $SEO s%^.*\\(SharedModule.*mod_$module\\..*\\)%# \\1%g $sedsubst +echo $SEO s%^.*\\(SharedModule.*lib$module\\..*\\)%# \\1%g $sedsubst m=no fi eval share=\$shared_$module if [ x$share = xyes ]; then -echo $SEO s%^\\(.*\\)AddModule\\(.*[_b/]$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g $sedsubst +echo $SEO s%^\\(.*\\)AddModule\\(.*mod_$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g $sedsubst +echo $SEO s%^\\(.*\\)AddModule\\(.*lib$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g $sedsubst m=$m [shared] fi if [ x$verbose = xyes ]; then
cvs commit: apache-1.3 configure
bjh 99/08/13 08:05:49
Modified:.configure
Log:
Translate module names to dll names for OS/2 so that they are no more
than 8 characters long and have an extension of dll instead of so.
Revision ChangesPath
1.101 +9 -0 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- configure 1999/08/13 06:36:16 1.100
+++ configure 1999/08/13 15:05:48 1.101
@@ -1423,6 +1423,15 @@
done
IFS=$OIFS
+# translate module names to dll names for OS/2 so that they are no more
+# than 8 characters long and have an extension of dll instead of so
+case $PLATFORM in
+*OS/2* )
+echo $SEO s%/mod_\\(.\\{1,8\\}\\).*\\.so%/\\1\\.dll% $sedsubst
+echo $SEO s%/\\(lib.*\\)\\.so$%/\\1.dll% $sedsubst
+;;
+esac
+
# split sedsubst into chunks of 50 commands
# to workaround limits in braindead seds
files=`$AWK $sedsubst '
cvs commit: apache-1.3 configure
martin 99/08/12 06:39:34 Modified:.configure Log: Undo last change. People will have to make sure that the same $DBM_LIB is in effect as was during the original configure invocation when executing config.status Revision ChangesPath 1.99 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- configure 1999/08/10 14:55:20 1.98 +++ configure 1999/08/12 13:39:33 1.99 @@ -968,7 +968,7 @@ echo ## $configstatus echo $configstatus for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ - LDFLAGS_SHLIB_EXPORT LIBS DBM_LIB INCLUDES RANLIB DEPS TARGET; do + LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET; do eval val=\\$$var\ if [ x$val != x ]; then echo $var=$val |\
cvs commit: apache-1.3 configure
martin 99/08/10 07:55:23 Modified:.configure Log: Save the DBM_LIB setting in the generated config.status file, since it is used within find-dbm-lib to modify the setting of LIBS Revision ChangesPath 1.98 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- configure 1999/08/09 17:05:01 1.97 +++ configure 1999/08/10 14:55:20 1.98 @@ -968,7 +968,7 @@ echo ## $configstatus echo $configstatus for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ - LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET; do + LDFLAGS_SHLIB_EXPORT LIBS DBM_LIB INCLUDES RANLIB DEPS TARGET; do eval val=\\$$var\ if [ x$val != x ]; then echo $var=$val |\
cvs commit: apache-1.3 configure
coar99/08/09 10:05:02 Modified:.configure Log: If mod_mmap_static is experimental yet listed, then so ought mod_auth_digest be -- especially since we're probably closer to unexperimentalising it.. Revision ChangesPath 1.97 +1 -0 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- configure 1999/08/06 03:35:00 1.96 +++ configure 1999/08/09 17:05:01 1.97 @@ -754,6 +754,7 @@ module_mmap_static=no # not all platforms have mmap() module_so=no # not all platforms have dlopen() module_example=no # only for developers +module_auth_digest=no # experimental module_log_agent=no # deprecated module_log_referer=no # deprecated ;;
cvs commit: apache-1.3 configure
wsanchez99/08/05 20:29:13
Modified:.configure
Log:
Pass appropriate strip flags to install.
Revision ChangesPath
1.95 +13 -3 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- configure 1999/07/10 18:27:25 1.94
+++ configure 1999/08/06 03:29:11 1.95
@@ -317,9 +317,19 @@
## Platform-specific defaults
##
case $PLATFORM in
-*-apple-rhapsody*) default_layout=Mac OS X Server;;
-*-apple-macos*)default_layout=Mac OS X Server;;
-*) default_layout=Apache;;
+*-apple-rhapsody*)
+ default_layout=Mac OS X Server
+ iflags_core=${iflags_core} -S \-S\
+ iflags_dso=${iflags_core} -S \-S\
+ ;;
+*-apple-macos*)
+ default_layout=Mac OS X Server
+ iflags_core=${iflags_core} -S \-S\
+ iflags_dso=${iflags_core} -S \-S\
+ ;;
+ *)
+ default_layout=Apache
+ ;;
esac
##
cvs commit: apache-1.3 configure
wsanchez99/08/05 20:35:00
Modified:.configure
Log:
Oops. Wrong cut-n-paste.
Revision ChangesPath
1.96 +2 -2 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- configure 1999/08/06 03:29:11 1.95
+++ configure 1999/08/06 03:35:00 1.96
@@ -320,12 +320,12 @@
*-apple-rhapsody*)
default_layout=Mac OS X Server
iflags_core=${iflags_core} -S \-S\
- iflags_dso=${iflags_core} -S \-S\
+ iflags_dso=${iflags_dso} -S \-S\
;;
*-apple-macos*)
default_layout=Mac OS X Server
iflags_core=${iflags_core} -S \-S\
- iflags_dso=${iflags_core} -S \-S\
+ iflags_dso=${iflags_dso} -S \-S\
;;
*)
default_layout=Apache
cvs commit: apache-1.3 configure
randy 99/06/17 10:45:00 Modified:.configure Log: Correct some english grammar. Revision ChangesPath 1.93 +4 -4 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- configure 1999/05/17 07:09:06 1.92 +++ configure 1999/06/17 17:44:59 1.93 @@ -991,14 +991,14 @@ exit 1 fi if [ x`$aux/getuid.sh` != x0 ]; then -echo + Warning: You enabled the suEXEC feature. Be aware that you need 12 -echo + root privileges for this, at the latest at the installation step. 12 +echo + Warning: You have enabled the suEXEC feature. Be aware that you need 12 +echo + root privileges to complete the final installation step. 12 fi fi if [ x$PERL = xno-perl-on-this-system ]; then if [ x$quiet = xno ]; then -echo + Warning: no Perl interpreter available for support scripts. -echo + Perhaps you have to select one with --with-perl=FILE. +echo + Warning: no Perl interpreter detected for support scripts. +echo + Perhaps you need to specify one with --with-perl=FILE. fi fi
cvs commit: apache-1.3 configure
wsanchez99/05/05 17:44:18 Modified:.configure Log: Make platform-dependant choice as to default layout for Mac OS and Mac OS X Server. Revision ChangesPath 1.91 +11 -2 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- configure 1999/05/04 02:55:15 1.90 +++ configure 1999/05/06 00:44:16 1.91 @@ -309,6 +309,15 @@ IFS=$OIFS ## +## Platform-specific defaults +## +case $PLATFORM in +*-apple-rhapsody*) default_layout=Mac OS X Server;; +*-apple-macos*)default_layout=Mac OS X Server;; +*) default_layout=Apache;; +esac + +## ## support for the default layout ## case $* in @@ -316,9 +325,9 @@ ;; * ) if [ x$* = x ]; then -set -- '--with-layout=Apache' +set -- --with-layout=$default_layout else -set -- '--with-layout=Apache' $@ +set -- --with-layout=$default_layout $@ fi ;; esac
cvs commit: apache-1.3 configure
bjh 99/04/28 19:13:11
Modified:.configure
Log:
Prevent grep error messages on systems with no /etc/passwd
Revision ChangesPath
1.88 +14 -12apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- configure 1999/04/28 08:01:41 1.87
+++ configure 1999/04/29 02:13:09 1.88
@@ -1057,18 +1057,20 @@
conf_serveradmin=[EMAIL PROTECTED]
conf_servername=new.host.name
if [ x$confadjust = x1 ]; then
-for uid in nobody www daemon demon http httpd; do
-if [ x`egrep \^${uid}: /etc/passwd` != x ]; then
-conf_user=$uid
-break
-fi
-done
-for gid in nobody nogroup www daemon demon http httpd; do
-if [ x`egrep \^${gid}: /etc/group` != x ]; then
-conf_group=$gid
-break
-fi
-done
+if [ -f /etc/passwd ]; then
+for uid in nobody www daemon demon http httpd; do
+if [ x`egrep \^${uid}: /etc/passwd` != x ]; then
+conf_user=$uid
+break
+fi
+done
+for gid in nobody nogroup www daemon demon http httpd; do
+if [ x`egrep \^${gid}: /etc/group` != x ]; then
+conf_group=$gid
+break
+fi
+done
+fi
if [ x`$aux/getuid.sh` != x0 ]; then
conf_port=8080
fi
cvs commit: apache-1.3 configure
rse 99/04/22 02:09:20 Modified:.configure Log: Fix new getuid.sh calls: The path is $aux and a closing ` char is needed. Revision ChangesPath 1.86 +2 -2 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- configure 1999/04/21 19:52:39 1.85 +++ configure 1999/04/22 09:09:19 1.86 @@ -953,7 +953,7 @@ echo and htdocs/manual/suexec.html documents first. exit 1 fi -if [ x`src/helpers/getuid.sh != x0 ]; then +if [ x`$aux/getuid.sh` != x0 ]; then echo + Warning: You enabled the suEXEC feature. Be aware that you need 12 echo + root privileges for this, at the latest at the installation step. 12 fi @@ -1047,7 +1047,7 @@ break fi done -if [ x`src/helpers/getuid.sh != x0 ]; then +if [ x`$aux/getuid.sh` != x0 ]; then conf_port=8080 fi conf_serveradmin=`$aux/buildinfo.sh -n [EMAIL PROTECTED]
cvs commit: apache-1.3 configure
dgaudet 99/04/21 00:21:04
Modified:.configure
Log:
fix typo
PR: 4282
Submitted by: Philippe M.Chiasson [EMAIL PROTECTED]
Revision ChangesPath
1.83 +1 -1 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- configure 1999/04/20 18:19:14 1.82
+++ configure 1999/04/21 07:21:03 1.83
@@ -780,7 +780,7 @@
module )
case $apc_optarg in
all )
- OOIFS=$IFSr
+ OOIFS=$IFS
IFS=':'
for module in $modules; do
eval module_${module}=no
cvs commit: apache-1.3 configure
rse 99/04/21 07:49:00
Modified:.configure
Log:
Various source cleanups to APACI's configure script, especially to finish the
.X - xX transition (o my nice dots... :) where Jim has forgotten some
instances when he converted the source in the past...
Revision ChangesPath
1.84 +21 -14apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- configure 1999/04/21 07:21:03 1.83
+++ configure 1999/04/21 14:48:58 1.84
@@ -87,12 +87,19 @@
quiet=no
verbose=no
case $* in
---help|*--help|*--help* ) help=yes; quiet=yes
- echo hang on a moment, generating help
- ;;
---quiet|*--quiet|*--quiet* ) quiet=yes ;;
---verbose|*--verbose|*--verbose*|-v|*-v|*-v* ) verbose=yes ;;
-* ) ;;
+--help|*--help|*--help* )
+help=yes; quiet=yes
+echo [hang on a moment, generating help]
+echo
+;;
+--quiet|*--quiet|*--quiet* )
+quiet=yes
+;;
+--verbose|*--verbose|*--verbose*|-v|*-v|*-v* )
+verbose=yes
+;;
+* )
+;;
esac
##
@@ -159,7 +166,7 @@
fi
##
-## Look for a good tar. If we don't find 'GNU tar' then make
+## Look for a good Tar. If we don't find 'GNU tar' then make
## sure ours can handle the '-h' (don't copy symlink, copy
## the actual data) option.
##
@@ -245,10 +252,10 @@
for module in `egrep '^[#]*(Add|Shared)Module' $src/Configuration.tmpl`;
do
add=yes
share=no
-if [ .`echo $module | grep '^#'` != . ]; then
+if [ x`echo $module | grep '^#'` != x ]; then
add=no
fi
-if [ .`echo $module | grep 'SharedModule'` != . ]; then
+if [ x`echo $module | grep 'SharedModule'` != x ]; then
share=yes
fi
module=`echo $module |\
@@ -498,7 +505,7 @@
# Makefile is for platform bootstrapping, so don't hardcode
paths)
gnutriple=`$aux/GuessOS | sed -e 's:/:-:g' | awk '{
printf(%s,$1); }'`
# create Makefile wrapper (the first time only)
-if [ .`ls $top/src.* 2/dev/null` = . ]; then
+if [ x`ls $top/src.* 2/dev/null` = x ]; then
if [ x$quiet = xno ]; then
echo + creating Makefile (shadow wrapper)
fi
@@ -598,7 +605,7 @@
;;
--add-module=*)
file=$apc_optarg
-if [ .`echo $file | egrep
'/?mod_[a-zA-Z0-9][a-zA-Z0-9_]*\.c$'` = . ]; then
+if [ x`echo $file | egrep
'/?mod_[a-zA-Z0-9][a-zA-Z0-9_]*\.c$'` = x ]; then
echo configure:Error: Module filename doesn't match
'/?mod_[a-zA-Z0-9][a-zA-Z0-9_]*\.c' 12
exit 1
fi
@@ -946,7 +953,7 @@
echo and htdocs/manual/suexec.html documents
first.
exit 1
fi
-if [ .`id | grep root` = . ]; then
+if [ x`id | grep root` = x ]; then
echo + Warning: You enabled the suEXEC feature. Be aware that you
need 12
echo + root privileges for this, at the latest at the installation
step. 12
fi
@@ -962,7 +969,7 @@
## target name
##
if [ x$TARGET != x ]; then
-thetarget=$TARGET
+thetarget=$TARGET
else
thetarget=httpd
fi
@@ -1040,7 +1047,7 @@
break
fi
done
-if [ .`id | grep root` = . ]; then
+if [ x`id | grep root` = x ]; then
conf_port=8080
fi
conf_serveradmin=`$aux/buildinfo.sh -n [EMAIL PROTECTED]
cvs commit: apache-1.3 configure
jim 99/04/21 12:52:40 Modified:.configure Log: Use the new getuid.sh script Revision ChangesPath 1.85 +2 -2 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- configure 1999/04/21 14:48:58 1.84 +++ configure 1999/04/21 19:52:39 1.85 @@ -953,7 +953,7 @@ echo and htdocs/manual/suexec.html documents first. exit 1 fi -if [ x`id | grep root` = x ]; then +if [ x`src/helpers/getuid.sh != x0 ]; then echo + Warning: You enabled the suEXEC feature. Be aware that you need 12 echo + root privileges for this, at the latest at the installation step. 12 fi @@ -1047,7 +1047,7 @@ break fi done -if [ x`id | grep root` = x ]; then +if [ x`src/helpers/getuid.sh != x0 ]; then conf_port=8080 fi conf_serveradmin=`$aux/buildinfo.sh -n [EMAIL PROTECTED]
cvs commit: apache-1.3 configure
rse 99/04/02 02:38:03
Modified:src CHANGES
.configure
Log:
Don't hard-code the path to AWK in --shadow bootstrapping Makefile.
PR: 4050
Revision ChangesPath
1.1296+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1295
retrieving revision 1.1296
diff -u -r1.1295 -r1.1296
--- CHANGES 1999/03/30 06:19:06 1.1295
+++ CHANGES 1999/04/02 10:37:59 1.1296
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) Don't hard-code the path to AWK in --shadow bootstrapping Makefile.
+ [Ralf S. Engelschall] PR#4050
+
*) Add support for DSO module compilation on BSD/OS 3.x.
[Randy Terbush, Covalent Technologies]
1.79 +3 -1 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- configure 1999/03/29 11:40:18 1.78
+++ configure 1999/04/02 10:38:03 1.79
@@ -488,7 +488,9 @@
;;
esac
# determine GNU platform triple
-gnutriple=`$aux/GuessOS | sed -e 's:/:-:g' | $AWK '{
printf(%s,$1); }'`
+# (the use of `awk' and not `$AWK' here is correct, because
this
+# Makefile is for platform bootstrapping, so don't hardcode
paths)
+gnutriple=`$aux/GuessOS | sed -e 's:/:-:g' | awk '{
printf(%s,$1); }'`
# create Makefile wrapper (the first time only)
if [ .`ls $top/src.* 2/dev/null` = . ]; then
if [ x$quiet = xno ]; then
cvs commit: apache-1.3 configure
rse 99/03/23 08:25:39 Modified:src CHANGES .configure Log: Fix verbose output of APACI configure (option -v) Submitted by: Martin Kraemer, Ralf S. Engelschall Revision ChangesPath 1.1292+2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1291 retrieving revision 1.1292 diff -u -r1.1291 -r1.1292 --- CHANGES 1999/03/23 00:36:52 1.1291 +++ CHANGES 1999/03/23 16:25:34 1.1292 @@ -1,5 +1,7 @@ Changes with Apache 1.3.7 + *) Fix verbose output of APACI configure (option -v) + [Martin Kraemer, Ralf S. Engelschall] Changes with Apache 1.3.6 1.77 +2 -2 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- configure 1999/03/10 11:53:02 1.76 +++ configure 1999/03/23 16:25:38 1.77 @@ -1283,7 +1283,7 @@ if [ x$add = xyes ]; then echo $SEO s%^.*\\(AddModule.*[_b/]$module\\..*\\)%\\1%g $sedsubst echo $SEO s%^.*\\(SharedModule.*[_b/]$module\\..*\\)%\\1%g $sedsubst -m=yes [static] +m=yes else echo $SEO s%^.*\\(AddModule.*[_b/]$module\\..*\\)%# \\1%g $sedsubst echo $SEO s%^.*\\(SharedModule.*[_b/]$module\\..*\\)%# \\1%g $sedsubst @@ -1292,7 +1292,7 @@ eval share=\$shared_$module if [ x$share = xyes ]; then echo $SEO s%^\\(.*\\)AddModule\\(.*[_b/]$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g $sedsubst -m=yes [shared] +m=$m [shared] fi if [ x$verbose = xyes ]; then echo + Module $module: $m
cvs commit: apache-1.3 configure
rse 99/03/10 03:22:12
Modified:src CHANGES
.configure
Log:
Let APACI's configure script correctly complain for unknown --enable-XXX
and --disable-XXX options.
PR: 3958
Revision ChangesPath
1.1271+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1270
retrieving revision 1.1271
diff -u -r1.1270 -r1.1271
--- CHANGES 1999/03/10 11:06:06 1.1270
+++ CHANGES 1999/03/10 11:22:09 1.1271
@@ -1,5 +1,8 @@
Changes with Apache 1.3.5
+ *) Let APACI's configure script correctly complain for unknown --enable-XXX
+ and --disable-XXX options. [Ralf S. Engelschall] PR#3958
+
*) Link the shared core bootstrap program (``Rule SHARED_CORE=yes'') also
against libap.a and use its ap_snprintf() instead of sprintf() to avoid
possible buffer overflows. [Ralf S. Engelschall]
1.75 +8 -0 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- configure 1999/03/08 20:03:17 1.74
+++ configure 1999/03/10 11:22:11 1.75
@@ -729,6 +729,10 @@
suexec )
suexec=1
;;
+* )
+echo configure:Error: invalid option '$apc_option' 12
+exit 1
+;;
esac
;;
--disable-*)
@@ -786,6 +790,10 @@
eval shared_${apc_optarg}=no
;;
esac
+;;
+* )
+echo configure:Error: invalid option '$apc_option' 12
+exit 1
;;
esac
;;
cvs commit: apache-1.3 configure
jim 99/01/15 12:44:03
Modified:.configure
Log:
More style changes
Revision ChangesPath
1.69 +54 -54apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- configure 1999/01/15 20:06:57 1.68
+++ configure 1999/01/15 20:44:01 1.69
@@ -96,7 +96,7 @@
##
## display version information
##
-if [ .$quiet = .no ]; then
+if [ $quiet = no ]; then
APV=`cat $src/include/httpd.h |\
grep #define SERVER_BASEVERSION |\
sed -e 's/^[^]*//' -e 's/.*$//' -e 's/^Apache\///'`
@@ -119,7 +119,7 @@
##
PERL=no-perl-on-this-system
perlpath=`$aux/PrintPath perl5 perl miniperl`
-if [ x$perlpath != x ]; then
+if [ $perlpath != ]; then
PERL=$perlpath
fi
@@ -131,9 +131,9 @@
##
SEO='' # CHANGE THIS VARIABLE HERE IF YOU HAVE PROBLEMS WITH ECHO!
bytes=`echo $SEO '\1' | wc -c | awk '{ printf(%s, $1); }'`
-if [ .$bytes != .3 ]; then
+if [ $bytes != 3 ]; then
bytes=`echo -E '\1' | wc -c | awk '{ printf(%s, $1); }'`
-if [ .$bytes != .3 ]; then
+if [ $bytes != 3 ]; then
echo + Warning: Your 'echo' command is slightly broken.
echo + It interprets escape sequences per default. We already
echo + tried 'echo -E' but had no real success. If errors occur
@@ -152,7 +152,7 @@
##
AWK=awk
awkpath=`$aux/PrintPath nawk gawk awk`
-if [ x$awkpath != x ]; then
+if [ $awkpath != ]; then
AWK=$awkpath
fi
@@ -163,7 +163,7 @@
##
TAR=tar
tarpath=`$aux/PrintPath gtar gnutar tar`
-if [ x$awkpath != x ]; then
+if [ $awkpath != ]; then
TAR=$tarpath
fi
case `$TAR --version 2/dev/null` in
@@ -245,7 +245,7 @@
eval shared_$module=$share
modules=${modules}:$module
modulelist=${modulelist}:$module=$add
-if [ .$share = .yes ]; then
+if [ $share = yes ]; then
modulelist=${modulelist}*
fi
done
@@ -258,7 +258,7 @@
OIFS=$IFS IFS=$DIFS
for var in CFLAGS LDFLAGS LIBS INCLUDES DEPS; do
eval val=\$EXTRA_$var
-if [ x$val != x ]; then
+if [ $val != ]; then
eval $var=\$val
eval EXTRA_$var=\\; export EXTRA_$var
echo + Hint: please use $var instead of EXTRA_$var next time
@@ -273,7 +273,7 @@
*--with-layout=* )
;;
* )
-if [ x$* = x ]; then
+if [ $* = ]; then
set -- '--with-layout=Apache'
else
set -- '--with-layout=Apache' $@
@@ -293,7 +293,7 @@
for apc_option
do
# if previous option needs an argument, assign it.
-if [ x$apc_prev != x ]; then
+if [ $apc_prev != ]; then
eval $apc_prev=\$apc_option
apc_prev=
continue
@@ -366,7 +366,7 @@
exit 0
;;
--with-layout=*|--compat)
-if [ .$apc_option = .--compat ]; then
+if [ $apc_option = --compat ]; then
apc_optarg=Apache
fi
case $apc_optarg in
@@ -408,11 +408,11 @@
done
IFS=$OIFS
rm -f $pldconf 2/dev/null
-if [ .$prefix = .UNSET ]; then
+if [ $prefix = UNSET ]; then
echo configure:Error: Path layout definition not found or
incorrect 12
exit 1
fi
-if [ .$quiet = .no ]; then
+if [ $quiet = no ]; then
echo + using installation path layout: $name ($file)
fi
with_layout=1
@@ -433,7 +433,7 @@
for apc_option
do
# if previous option needs an argument, assign it.
-if [ x$apc_prev != x ]; then
+if [ $apc_prev != ]; then
eval $apc_prev=\$apc_option
apc_prev=
continue
@@ -461,7 +461,7 @@
case $apc_option in
--shadow=*)
shadow=$apc_optarg
-if [ .$quiet = .no ]; then
+if [ $quiet = no ]; then
echo + creating external package shadow tree
($shadow)
fi
rm -rf $shadow 2/dev/null
@@ -469,7 +469,7 @@
for file in $mkf $sedsubst $addconf $tplconf $pldconf
$configstatus; do
rm -f $shadow/$file 2/dev/null
done
-if [ .$quiet = .no ]; then
+if [ $quiet = no ]; then
echo + switching to external package shadow tree
($shadow)
fi
cd $shadow
@@ -479,14 +479,14 @@
gnutriple=`$aux/GuessOS | sed -e
cvs commit: apache-1.3 configure
rse 99/01/02 05:19:42 Modified:src CHANGES .configure Log: Instead of fixing a bug in the generation procedure for config.status (a backslash was missing) we remove the bug together with it's complete context because the special cases of the past can now no longer occur because of the recent magic for the --with-layout default. PR: 3590 Revision ChangesPath 1.1192+6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1191 retrieving revision 1.1192 diff -u -r1.1191 -r1.1192 --- CHANGES 1999/01/02 12:45:10 1.1191 +++ CHANGES 1999/01/02 13:19:38 1.1192 @@ -1,4 +1,10 @@ Changes with Apache 1.3.4 + + *) Instead of fixing a bug in the generation procedure for config.status (a + backslash was missing) we remove the bug together with it's complete + context because the special cases of the past can now no longer occur + because of the recent magic for the --with-layout default. + [Ralf S. Engelschall] PR#3590 *) Make top-level Makefile aware of a parallel build procedures (make -j) by making sure the src/support/ tools are _forced_ to be build last (they 1.67 +8 -12 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- configure 1999/01/01 19:04:32 1.66 +++ configure 1999/01/02 13:19:41 1.67 @@ -867,18 +867,14 @@ -e 's:$: \\:' $configstatus fi done -if [ $# -eq 0 ]; then -echo ./configure $configstatus -else -echo $SEO ./configure \\ $configstatus -for arg -do -echo $arg |\ -sed -e 's:\([$\\]\):\\\1:g' \ --e 's:^::' \ --e 's:$: \\:' $configstatus -done -fi +echo $SEO ./configure \\ $configstatus +for arg +do +echo $arg |\ +sed -e 's:\([$\\]\):\\\1:g' \ +-e 's:^::' \ +-e 's:$: \\:' $configstatus +done echo '$@' $configstatus echo '' $configstatus chmod a+x $configstatus
cvs commit: apache-1.3 configure
randy 98/12/29 22:10:04 Modified:.configure Log: Shell compatibility change to allow this to work with QNX's /bin/sh when not specifying any command line arguments. Revision ChangesPath 1.64 +5 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- configure 1998/12/16 15:57:28 1.63 +++ configure 1998/12/30 06:10:03 1.64 @@ -252,7 +252,11 @@ *--with-layout=* ) ;; * ) -set -- '--with-layout=Apache' $@ +if [ x$@ = x ]; then +set -- '--with-layout=Apache' +else +set -- '--with-layout=Apache' $@ +fi ;; esac
cvs commit: apache-1.3 configure
rse 98/12/30 14:44:59 Modified:.configure Log: Never use $@ inside quotes when you don't want to expand it into _multiple_ quoted args. So, for the `test' $* _has_ to be used while for the `set' $@ is correct (here $* would break it). Revision ChangesPath 1.65 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- configure 1998/12/30 06:10:03 1.64 +++ configure 1998/12/30 22:44:58 1.65 @@ -252,7 +252,7 @@ *--with-layout=* ) ;; * ) -if [ x$@ = x ]; then +if [ .$* = . ]; then set -- '--with-layout=Apache' else set -- '--with-layout=Apache' $@
cvs commit: apache-1.3 configure
rse 98/12/16 02:57:46 Modified:.configure Log: Fix a few recently introduced bugs in APACI. Especially the option reversing breaks the --activate-module facility and other similar additive option based things. Revision ChangesPath 1.62 +4 -3 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- configure 1998/12/14 01:03:31 1.61 +++ configure 1998/12/16 10:57:45 1.62 @@ -344,7 +344,7 @@ exit 0 ;; --with-layout=*|--compat) - if [ .$apc_option = .--compat ]; then +if [ .$apc_option = .--compat ]; then apc_optarg=Apache fi case $apc_optarg in @@ -378,11 +378,12 @@ fi with_layout=1 ;; - *) - args=$apc_option $args +*) +args=$args $apc_option ;; esac done +IFS=$OIFS1 if [ .$with_layout = .0 ]; then echo configure:Error: Please select an installation path layout with
cvs commit: apache-1.3 configure config.layout
rse 98/12/16 07:57:28 Modified:src CHANGES .configure config.layout Log: Removed recently introduced bugs and disfigurements in APACI: o fixed argument line processing: using $args was broken: It was not initialized and using args=$args $apc_option and even args=$args \$apc_option\ fails in the second processing round for any arguments containing whitespaces. The only correct way is to use the construct $@ (but not possible here) or iterate _both_ times over the implicit argument line (no argument to for-loop) which is what we now use. o make --with-layout=Apache the default without creating redundancy (copying the --with-layout block in the argument parsing loop). We achieve this by using the $@ construct together with the `set' command to prepend --with-layout=Apache to the command line in case --with-layout is not used. o fixed auto-suffix handling now that config.layout exists. Paths which are auto-suffixed are marked with a trailing plus sign in config.layout and every path now can be marked this way (not only the four paths for which we do it currently). Additionally the suffix is no longer a static one. Instead it's now `/target' where target is the argument of the --target option or per default `httpd'. o allow also tabs (and only spaces) where we match whitespaces o various fixes and cleanups related to used shell coding style o made Jim happy by replacing `Written by' with `Initially written by' ;-) o trimmed output of --help to fit into 80 columns Now APACI is again clean and ready for 1.3.4 ;-) (IMHO) Revision ChangesPath 1.1171+24 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1170 retrieving revision 1.1171 diff -u -r1.1170 -r1.1171 --- CHANGES 1998/12/12 05:26:00 1.1170 +++ CHANGES 1998/12/16 15:57:26 1.1171 @@ -1,5 +1,29 @@ Changes with Apache 1.3.4 + *) Removed recently introduced bugs and disfigurements in APACI: + o fixed argument line processing: using $args was broken: It was not + initialized and using args=$args $apc_option and even args=$args + \$apc_option\ fails in the second processing round for any arguments + containing whitespaces. The only correct way is to use the construct + $@ (but not possible here) or iterate _both_ times over the implicit + argument line (no argument to for-loop) which is what we now use. + o make --with-layout=Apache the default without creating + redundancy (copying the --with-layout block in the argument parsing + loop). We achieve this by using the $@ construct together with the + `set' command to prepend --with-layout=Apache to the command line in + case --with-layout is not used. + o fixed auto-suffix handling now that config.layout exists. + Paths which are auto-suffixed are marked with a trailing plus sign in + config.layout and every path now can be marked this way (not only the + four paths for which we do it currently). Additionally the suffix is + no longer a static one. Instead it's now `/target' where target is + the argument of the --target option or per default `httpd'. + o allow also tabs (and only spaces) where we match whitespaces + o various fixes and cleanups related to used shell coding style + o made Jim happy by replacing `Written by' with `Initially written by' ;-) + o trimmed output of --help to fit into 80 columns + [Ralf S. Engelschall] + *) Added two new core API functions, ap_single_module_configure() and ap_single_module_init(), which are now used by mod_so to correctly initialize a module after loading. This fixes a problem with unusable 1.63 +101 -89 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- configure 1998/12/16 10:57:45 1.62 +++ configure 1998/12/16 15:57:28 1.63 @@ -58,7 +58,7 @@ ## ## configure -- Apache Autoconf-style Interface (APACI) ## -## Written by Ralf S. Engelschall [EMAIL PROTECTED] +## Initially written by Ralf S. Engelschall [EMAIL PROTECTED] ## # default input separator chars: spacetabcr @@ -68,7 +68,6 @@ ## ## the paths to the Apache source tree ## - top=. mkf=Makefile src=src @@ -84,7 +83,6 @@ ## ## pre-determine runtime modes ## - help=no quiet=no verbose=no @@ -98,7 +96,6 @@ ## ## display version information ## - if [ .$quiet = .no ]; then
cvs commit: apache-1.3 configure
randy 98/12/13 14:43:08 Modified:.configure Log: Recognize .module config files as does Configure. Revision ChangesPath 1.60 +1 -0 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- configure 1998/12/12 18:22:47 1.59 +++ configure 1998/12/13 22:43:07 1.60 @@ -235,6 +235,7 @@ module=`echo $module |\ sed -e 's%^.*/\(.*\)$%\1%' \ -e 's/\.[oa]$//' \ +-e 's/\.module$//' \ -e 's/^mod_//' \ -e 's/^lib//'` eval module_$module=$add
cvs commit: apache-1.3 configure
lars98/12/12 10:22:48 Modified:.configure Log: 'configure --help' should work without the '--with-layout' option. Handle '--help' before we complain about a missing --with-layout option. Revision ChangesPath 1.59 +62 -61apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- configure 1998/12/09 20:51:39 1.58 +++ configure 1998/12/12 18:22:47 1.59 @@ -263,7 +263,8 @@ IFS=$OIFS ## -## preprocess path layout definititions so that these can be overriden +## check for help option and preprocess path layout definititions so that +## these can be overriden ## apc_prev= OIFS1=$IFS IFS=$DIFS @@ -282,6 +283,66 @@ esac case $apc_option in +--help | -h | -help ) +echo Usage: configure [options] +echo Options: [defaults in brackets after descriptions] +echo General options: +echo --quiet, --silent do not print messages +echo --verbose, -v print even more messages +echo --shadow[=DIR] switch to a shadow tree (under DIR) for building +echo +echo Stand-alone options: +echo --help, -h print this message +echo --show-layout print installation path layout (check and debug) +echo +echo Installation layout options: +echo --with-layout=[F:]ID use installation path layout ID (from file F) +echo --target=TARGETinstall server executable and associated files using basename TARGET +echo --prefix=PREFIXinstall architecture-independent files in PREFIX +echo --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +echo --bindir=DIR install user executables in DIR +echo --sbindir=DIR install sysadmin executables in DIR +echo --libexecdir=DIR install program executables in DIR +echo --mandir=DIR install manual pages in DIR +echo --sysconfdir=DIR install configuration files in DIR +echo --datadir=DIR install read-only data files in DIR +echo --includedir=DIR install includes files in DIR +echo --localstatedir=DIRinstall modifiable data files in DIR +echo --runtimedir=DIR install runtime data in DIR +echo --logfiledir=DIR install logfile data in DIR +echo --proxycachedir=DIRinstall proxy cache data in DIR +echo +echo Configuration options: +echo --enable-rule=NAME enable a particular Rule named 'NAME' +echo --disable-rule=NAMEdisable a particular Rule named 'NAME' +$aux/ppl.sh $rulelist +echo --add-module=FILE on-the-fly copy activate a third-party Module source +echo --activate-module=FILE on-the-fly activate existing third-party Module source +echo --permute-module=N1:N2 permute module 'N1' with module 'N2' in the configuration +echo --enable-module=NAME enable a particular Module named 'NAME' +echo --disable-module=NAME disable a particular Module named 'NAME' +$aux/ppl.sh $modulelist +echo --enable-shared=NAME enable build of Module named 'NAME' as a shared object +echo --disable-shared=NAME disable build of Module named 'NAME' as a shared object +echo --with-perl=FILE set the path to the optional Perl interpreter to use +echo --without-support disable the build and installation of support tools +echo --without-confadjust disable some build user/situation adjustments to config files +echo +echo suEXEC options: +echo --enable-suexecenable the suEXEC feature +echo --suexec-caller=NAME set the suEXEC username of the allowed caller [$suexec_caller] +echo --suexec-docroot=DIR set the suEXEC root directory [PREFIX/share/htdocs] +echo --suexec-logfile=FILE set the suEXEC logfile [PREFIX/var/log/suexec_log] +echo --suexec-userdir=DIR set the suEXEC user subdirectory [$suexec_userdir] +echo --suexec-uidmin=UIDset the suEXEC minimal allowed UID [$suexec_uidmin] +echo --suexec-gidmin=GIDset the suEXEC minimal allowed GID [$suexec_gidmin] +echo --suexec-safepath=PATH set the suEXEC safe PATH [$suexec_safepath] +
cvs commit: apache-1.3 configure
randy 98/12/09 12:51:41 Modified:.configure Log: Modify recent --with-layout option to set these variables first from the config.layout file (or specified file) and allow the any other configuration arguments to override portions of that layout. ie. --prefix etc. Revision ChangesPath 1.58 +69 -44apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- configure 1998/12/06 15:40:51 1.57 +++ configure 1998/12/09 20:51:39 1.58 @@ -263,10 +263,8 @@ IFS=$OIFS ## -## parse argument line options +## preprocess path layout definititions so that these can be overriden ## - -addconf_created=0 apc_prev= OIFS1=$IFS IFS=$DIFS for apc_option @@ -283,6 +281,74 @@ *) apc_optarg= ;; esac +case $apc_option in +--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/.*://'` +;; +* ) +name=$apc_optarg +file=$configlayout +;; +esac +if [ ! -f $file ]; then +echo configure:Error: Path layout definition file $file not found 12 +exit 1 +fi +sed -e 1,/[ ]*[Ll]ayout[ ]*$name[]*[]*/d \ +-e '/[ ]*\/Layout[ ]*/,$d' \ +-e s/^[ ]*//g \ +-e s/:[ ]*/=\'/g \ +-e s/[ ]*$/'/g \ +$file $pldconf +. $pldconf +rm -f $pldconf 2/dev/null +if [ .$prefix = .UNSET ]; then +echo configure:Error: Path layout definition not found or incorrect 12 +exit 1 +fi +if [ .$quiet = .no ]; then +echo + using installation path layout: $name ($file) +fi +with_layout=1 +;; + *) + args=$apc_option $args +;; +esac +done + +if [ .$with_layout = .0 ]; then +echo configure:Error: Please select an installation path layout with +echo the --with-layout=[FILE:]ID option. Use 'Apache' or +echo 'GNU' for ID to select the two predefined layouts. +exit 1 +fi + +## +## parse argument line options +## +addconf_created=0 +apc_prev= +OIFS1=$IFS IFS=$DIFS +for apc_option in $args +do +# if previous option needs an argument, assign it. +if [ .$apc_prev != . ]; then +eval $apc_prev=\$apc_option +apc_prev= +continue +fi +# split out arguments +case $apc_option in +-*=*) apc_optarg=`echo $apc_option | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) apc_optarg= ;; +esac # accept only the most important GNU Autoconf-style options case $apc_option in --quiet | --silent) @@ -415,41 +481,6 @@ 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/.*://'` -;; -* ) -name=$apc_optarg -file=$configlayout -;; -esac -if [ ! -f $file ]; then -echo configure:Error: Path layout definition file $file not found 12 -exit 1 -fi -sed -e 1,/[ ]*[Ll]ayout[ ]*$name[]*[]*/d \ --e '/[ ]*\/Layout[ ]*/,$d' \ --e s/^[ ]*//g \ --e s/:[ ]*/=\'/g \ --e s/[ ]*$/'/g \ -$file $pldconf -. $pldconf -rm -f $pldconf 2/dev/null -if [ .$prefix = .UNSET ]; then -echo configure:Error: Path layout definition not found or incorrect 12 -exit 1 -fi -if [ .$quiet = .no ]; then -echo + using installation path layout: $name ($file) -fi -with_layout=1 -;;
cvs commit: apache-1.3 configure
rse 98/12/06 07:40:52 Modified:src CHANGES .configure Log: Make generation of src/Configuration.apaci more robust: It failed to differenciate between modules when one module name was a postfix of another (e.g. cgi vs. fastcgi). We now check for mod_XXX, libXXX and even just XXX (think about totally non-standard names like apache_ssl, PR: 3380 Revision ChangesPath 1.1164+6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1163 retrieving revision 1.1164 diff -u -r1.1163 -r1.1164 --- CHANGES 1998/12/06 15:22:33 1.1163 +++ CHANGES 1998/12/06 15:40:50 1.1164 @@ -1,4 +1,10 @@ Changes with Apache 1.3.4 + + *) Make generation of src/Configuration.apaci more robust: It failed to + differenciate between modules when one module name was a postfix of + another (e.g. cgi vs. fastcgi). We now check for mod_XXX, libXXX and even + just XXX (think about totally non-standard names like apache_ssl, too). + [Ralf S. Engelschall] PR#3380 *) In src/Configure remove the SERVER_SUBVERSION support (already deprecated since 1.3b7) and make whitespace handling more robust (it failed horrible 1.57 +5 -5 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- configure 1998/12/05 11:13:43 1.56 +++ configure 1998/12/06 15:40:51 1.57 @@ -1202,17 +1202,17 @@ for module in $modules; do eval add=\$module_$module if [ $add = yes ]; then -echo $SEO s%^.*\\(AddModule.*$module\\..*\\)%\\1%g $sedsubst -echo $SEO s%^.*\\(SharedModule.*$module\\..*\\)%\\1%g $sedsubst +echo $SEO s%^.*\\(AddModule.*[_b/]$module\\..*\\)%\\1%g $sedsubst +echo $SEO s%^.*\\(SharedModule.*[_b/]$module\\..*\\)%\\1%g $sedsubst m=yes [static] else -echo $SEO s%^.*\\(AddModule.*$module\\..*\\)%# \\1%g $sedsubst -echo $SEO s%^.*\\(SharedModule.*$module\\..*\\)%# \\1%g $sedsubst +echo $SEO s%^.*\\(AddModule.*[_b/]$module\\..*\\)%# \\1%g $sedsubst +echo $SEO s%^.*\\(SharedModule.*[_b/]$module\\..*\\)%# \\1%g $sedsubst m=no fi eval share=\$shared_$module if [ $share = yes ]; then -echo $SEO s%^\\(.*\\)AddModule\\(.*$module\\.\\)[oa]\\(.*\\)%\\1SharedModule\\2so\\3%g $sedsubst +echo $SEO s%^\\(.*\\)AddModule\\(.*[_b/]$module\\.\\)[oa]\\(.*\\)%\\1SharedModule\\2so\\3%g $sedsubst m=yes [shared] fi if [ $verbose = yes ]; then
cvs commit: apache-1.3 configure INSTALL Makefile.tmpl
rse 98/12/05 03:13:45 Modified:src CHANGES src/helpers mkshadow.sh .configure INSTALL Makefile.tmpl Log: Build outside of source tree (take 3) = This patch provides a --shadow=DIR option variant for APACI in addition to the already existing --shadow option. The difference is just this now: --shadow creates an internal build shadow tree --shadow=DIR creates first an external build shadow tree and then there the internal build shadow tree The result is obvious: With --shadow=DIR you now can mount the extracted Apache distribution tree read-only from NFS or CDROM or whatever and still use the complete functionality of APACI, _INCLUDING_ creating the internal build shadow trees to solve the parallel-platform conflict. Just one thing we have to change in general to allow this patch: We have to use the -h (don't follow symlinks) option of `tar' under `make install'. I checked this against FreeBSD, Linux, SunOS and Solaris and -h really seems a very old and well-supported option. Now the use case: $ cd apache_1.3.x $ ./configure --shadow=/tmp/apache [...] $ make -f /tmp/apache/Makefile $ make -f /tmp/apache/Makefile install Or alternatively: $ cd apache_1.3.x $ ./configure --shadow=/tmp/apache [...] $ cd /tmp/apache $ make $ make install As you can see this is _very_ similar to the non-shadow situation ;-): $ cd apache_1.3.x $ ./configure [...] $ make $ make install Revision ChangesPath 1.1162+8 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1161 retrieving revision 1.1162 diff -u -r1.1161 -r1.1162 --- CHANGES 1998/12/04 18:29:42 1.1161 +++ CHANGES 1998/12/05 11:13:41 1.1162 @@ -1,5 +1,13 @@ Changes with Apache 1.3.4 + *) Add APACI --shadow=DIR variant (in addition to --shadow). This now first + creates an external package shadow tree in DIR before the local build + shadow tree is generated under DIR. This way one can have the extracted + Apache distribution tree read-only on NFS or CDROM and still build Apache + from these sources. An automatically triggered VPATH-like mechanism is + provided through the TOP variable, too. + [Ralf S. Engelschall, Wilfredo Sanchez [EMAIL PROTECTED]] + *) Fix negotiation so that a Vary response header is correctly generated when, for a particular dimension, variants only vary in having or not having a value for that dimension. [Paul Sutton] 1.4 +43 -20apache-1.3/src/helpers/mkshadow.sh Index: mkshadow.sh === RCS file: /home/cvs/apache-1.3/src/helpers/mkshadow.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mkshadow.sh 1998/09/16 20:49:25 1.3 +++ mkshadow.sh 1998/12/05 11:13:42 1.4 @@ -19,18 +19,35 @@ src=`echo $1 | sed -e 's:/$::'` dst=`echo $2 | sed -e 's:/$::'` -# determine if source is an absolute path +# check whether source exists +if [ ! -d $src ]; then +echo mkshadow.sh:Error: source directory not found 12 +exit 1 +fi + +# determine if one of the paths is an absolute path, +# because then we have to use an absolute symlink +oneisabs=0 case $src in -/* ) srcisabs=1 ;; - * ) srcisabs=0 ;; +/* ) oneisabs=1 ;; esac - -# determine reverse directory to directory case $dst in -/* ) dstrevdir='' ;; - * ) dstrevdir=`$src/helpers/fp2rp $dst`/ ;; +/* ) oneisabs=1 ;; esac +# determine reverse directory for destination directory +dstrevdir='' +if [ $oneisabs = 0 ]; then +# (inlined fp2rp) +OIFS2=$IFS; IFS='/' +for pe in $dst; do +dstrevdir=../$dstrevdir +done +IFS=$OIFS2 +else +src=`cd $src; pwd`; +fi + # create directory tree at destination if [ ! -d $dst ]; then mkdir $dst @@ -48,7 +65,7 @@ # fill directory tree with symlinks to files FILES=`cd $src -find . -type f -depth -print |\ +find . -depth -print |\ sed -e '/\.o$/d' \ -e '/\.a$/d' \ -e '/\.so$/d' \ @@ -63,23 +80,29 @@ -e 's/^\.\///'` OIFS=$IFS IFS=$DIFS for file in $FILES; do + # don't use `-type f' above for find because of symlinks + if [ -d $file ]; then + continue + fi basename=`echo $file | sed -e 's:^.*/::'` dir=`echo $file | sed -e 's:[^/]*$::' -e 's:/$::' -e 's:$:/:' -e 's:^/$::'` from=$src/$file
cvs commit: apache-1.3 configure
rse 98/12/03 02:16:46
Modified:.configure
Log:
Don't intermix the real TARGET variable with the local helper variable.
Because else TARGET is included into config.status without need and the
TARGET=xx define in src/Configuration.apaci would be set always (which is
unclean although it doesn't harm).
Revision ChangesPath
1.55 +18 -14apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- configure 1998/12/02 09:09:16 1.54
+++ configure 1998/12/03 10:16:44 1.55
@@ -166,11 +166,6 @@
## determine default parameters
##
-# target name
-if [ .$TARGET = . ]; then
-TARGET=httpd
-fi
-
# default paths
prefix=UNSET
@@ -833,6 +828,15 @@
fi
##
+## target name
+##
+if [ .$TARGET != . ]; then
+thetarget=$TARGET
+else
+thetarget=httpd
+fi
+
+##
## expand path variables and make sure
## they do not end with a backslash
##
@@ -933,13 +937,13 @@
echo Compilation paths:
echoHTTPD_ROOT: $prefix
echo SHARED_CORE_DIR: $libexecdir
-echoDEFAULT_PIDLOG: ${runtimedir_relative}${TARGET}.pid
-echoDEFAULT_SCOREBOARD: ${runtimedir_relative}${TARGET}.scoreboard
-echo DEFAULT_LOCKFILE: ${runtimedir_relative}${TARGET}.lock
+echoDEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid
+echoDEFAULT_SCOREBOARD:
${runtimedir_relative}${thetarget}.scoreboard
+echo DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock
echo DEFAULT_XFERLOG: ${logfiledir_relative}access_log
echo DEFAULT_ERRORLOG: ${logfiledir_relative}error_log
echo TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types
-echoSERVER_CONFIG_FILE: ${sysconfdir_relative}${TARGET}.conf
+echoSERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf
echoACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf
echo RESOURCE_CONFIG_FILE: ${sysconfdir_relative}srm.conf
echo
@@ -970,7 +974,7 @@
-e [EMAIL PROTECTED]@%$src%g \
-e [EMAIL PROTECTED]@%$mkf%g \
-e [EMAIL PROTECTED]@%$aux%g \
--e [EMAIL PROTECTED]@%$TARGET%g \
+-e [EMAIL PROTECTED]@%$thetarget%g \
-e [EMAIL PROTECTED]@%$prefix%g \
-e [EMAIL PROTECTED]@%$exec_prefix%g \
-e [EMAIL PROTECTED]@%$bindir%g \
@@ -1013,13 +1017,13 @@
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=\${runtimedir_relative}${TARGET}.pid\'
$src/apaci
-echo echo
'-DDEFAULT_SCOREBOARD=\${runtimedir_relative}${TARGET}.scoreboard\'
$src/apaci
-echo echo '-DDEFAULT_LOCKFILE=\${runtimedir_relative}${TARGET}.lock\'
$src/apaci
+echo echo '-DDEFAULT_PIDLOG=\${runtimedir_relative}${thetarget}.pid\'
$src/apaci
+echo echo
'-DDEFAULT_SCOREBOARD=\${runtimedir_relative}${thetarget}.scoreboard\'
$src/apaci
+echo echo '-DDEFAULT_LOCKFILE=\${runtimedir_relative}${thetarget}.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}${TARGET}.conf\'
$src/apaci
+echo echo
'-DSERVER_CONFIG_FILE=\${sysconfdir_relative}${thetarget}.conf\' $src/apaci
echo echo '-DACCESS_CONFIG_FILE=\${sysconfdir_relative}access.conf\'
$src/apaci
echo echo '-DRESOURCE_CONFIG_FILE=\${sysconfdir_relative}srm.conf\'
$src/apaci
chmod a+x $src/apaci
cvs commit: apache-1.3 configure
rse 98/12/02 00:34:20 Modified:.configure Log: Fix a little bug: The DEPS variable (the EXTRA_DEPS of src/Configure.tmpl) wasn't remembered in config.status. Revision ChangesPath 1.53 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- configure 1998/12/02 06:11:52 1.52 +++ configure 1998/12/02 08:34:19 1.53 @@ -281,7 +281,7 @@ echo ## $configstatus echo $configstatus for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ - LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB TARGET; do + LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET; do eval val=\\$$var\ if [ .$val != . ]; then echo $var=$val |\
cvs commit: apache-1.3 configure INSTALL
rse 98/10/27 02:20:15
Modified:src CHANGES
.configure INSTALL
Log:
Add APACI --permute-module=foo:bar option which can be used to
on-the-fly/batch permute the order of two modules (mod_foo and mod_bar)
in the Configuration[.apaci] file. Two special and important variants are
supported for the option argument: first BEGIN:foo which permutes module
mod_foo with the begin of the module list, i.e. it `moves' the module to
the begin of the list (gives it lowest priority). And second foo:END
which permutes mod_foo with the end of the module list, i.e. it `moves'
the module to the end of the list (gives it highest priority).
Notice:
The way it is implemented looks a little bit too complicated but has to be
done this way because of portability reasons. And this implementation is now
already tested by me for portability under the following platforms:
o FreeBSD 2.2.2
o Debian GNU/Linux 1.3/2.0.35
o Solaris 2.5.1
o SunOS 4.1.3
Revision ChangesPath
1.1125+10 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1124
retrieving revision 1.1125
diff -u -r1.1124 -r1.1125
--- CHANGES 1998/10/26 21:30:17 1.1124
+++ CHANGES 1998/10/27 10:20:00 1.1125
@@ -1,5 +1,15 @@
Changes with Apache 1.3.4
+ *) Add APACI --permute-module=foo:bar option which can be used to
+ on-the-fly/batch permute the order of two modules (mod_foo and mod_bar)
+ in the Configuration[.apaci] file. Two special and important variants
are
+ supported for the option argument: first BEGIN:foo which permutes module
+ mod_foo with the begin of the module list, i.e. it `moves' the module to
+ the begin of the list (gives it lowest priority). And second foo:END
+ which permutes mod_foo with the end of the module list, i.e. it `moves'
+ the module to the end of the list (gives it highest priority).
+ [Ralf S. Engelschall]
+
*) Fix problem with 'apache -k shutdown' and startup event
synchronisation (Win32). [Ken Parzygnat [EMAIL PROTECTED]]
PR#3255
1.49 +103 -1apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- configure 1998/09/17 08:07:53 1.48
+++ configure 1998/10/27 10:20:12 1.49
@@ -75,6 +75,7 @@
aux=src/helpers
sedsubst=src/.apaci.sedsubst
addconf=src/.apaci.addconf
+tplconf=src/.apaci.tplconf
configstatus=config.status
##
@@ -203,6 +204,9 @@
# with adjustments
confadjust=1
+# module ordering
+permute=''
+
# determine rules
rules=
rulelist=
@@ -357,6 +361,7 @@
shadowaux=src.$gnutriple/helpers
shadowsedsubst=src.$gnutriple/.apaci.sedsubst
shadowaddconf=src.$gnutriple/.apaci.addconf
+shadowtplconf=src.$gnutriple/.apaci.tplconf
# (re)create shadow tree
if [ .$quiet = .no ]; then
echo + create shadow tree ($shadowsrc)
@@ -372,6 +377,7 @@
addconf=$shadowaddconf
rm -f $addconf 2/dev/null
touch $addconf
+tplconf=$shadowtplconf
;;
--help | -h | -help )
echo Usage: configure [options]
@@ -407,6 +413,7 @@
$aux/ppl.sh $rulelist
echo --add-module=FILE on-the-fly copy activate a
third-party Module source
echo --activate-module=FILE on-the-fly activate existing
third-party Module source
+echo --permute-module=N1:N2 permute module 'N1' with module
'N2' in the configuration
echo --enable-module=NAME enable a particular Module named
'NAME'
echo --disable-module=NAME disable a particular Module named
'NAME'
$aux/ppl.sh $modulelist
@@ -693,6 +700,29 @@
;;
esac
;;
+--permute-module=*:*)
+mod1=`echo $apc_optarg | sed -e 's/:.*//'`
+mod2=`echo $apc_optarg | sed -e 's/.*://'`
+for mod in $mod1 $mod2; do
+case $mod in
+BEGIN|END)
+;;
+*) eval exists=\$module_${mod}
+if [ .$exists = . ]; then
+echo configure:Error: No such module named
'${mod}' 12
+exit 1
+fi
+;;
+esac
+done
+case $mod1:$mod2 in
+BEGIN:END|*:BEGIN|END:*)
+
cvs commit: apache-1.3 configure
rse 98/09/17 01:07:54 Modified:src CHANGES .configure Log: ARGL, people on sw-mod-ssl and c.i.w.s.u said they have to fix the Group directive after installing, but no one said why or wrote a problem report. We lost an else inside the configure script which forced a failure of the configuration adjustment (we have one more problem: `conf_group = #-1' is fine under BSD Make, but GNU make sees `conf_group = ' because of the hash character): Fix APACI's `Group' configuration adjustment - especially for Linux platforms where `nogroup' exists in /etc/group. Revision ChangesPath 1.1062+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1061 retrieving revision 1.1062 diff -u -r1.1061 -r1.1062 --- CHANGES 1998/09/17 04:09:39 1.1061 +++ CHANGES 1998/09/17 08:07:52 1.1062 @@ -1,4 +1,7 @@ Changes with Apache 1.3.2 + + *) Fix APACI's `Group' configuration adjustment - especially for Linux + platforms where `nogroup' exists in /etc/group. [Ralf S. Engelschall] *) Make PrintPath work generically instead of having one version strictly for OS/2. [Jim Jagielski, Brian Havard] 1.48 +1 -0 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- configure 1998/09/16 20:37:41 1.47 +++ configure 1998/09/17 08:07:53 1.48 @@ -817,6 +817,7 @@ if [ .$confadjust = .1 ]; then if [ .`egrep '^nobody:' /etc/group` != . ]; then conf_group=nobody +else if [ .`egrep '^nogroup:' /etc/group` != . ]; then conf_group=nogroup fi
cvs commit: apache-1.3 configure
rse 98/08/15 08:02:46 Modified:src CHANGES .configure Log: Make sure the config.status file is not overridden when just ``configure --help'' is used. PR: 2844 Revision ChangesPath 1.1026+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1025 retrieving revision 1.1026 diff -u -r1.1025 -r1.1026 --- CHANGES 1998/08/14 03:00:15 1.1025 +++ CHANGES 1998/08/15 15:02:44 1.1026 @@ -1,5 +1,8 @@ Changes with Apache 1.3.2 + *) Make sure the config.status file is not overridden when just + ``configure --help'' is used. [Ralf S. Engelschall] PR#2844 + *) Split MODULE_MAGIC_NUMBER into _MAJOR/_MINOR numbers. This should provide a way to trace API changes that add functionality but do not create a compatibility issue for precompiled modules, etc. 1.43 +36 -33apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- configure 1998/07/28 17:26:45 1.42 +++ configure 1998/08/15 15:02:46 1.43 @@ -81,10 +81,11 @@ ## pre-determine runtime modes ## +help=no quiet=no verbose=no case $* in ---help|*--help|*--help* ) quiet=yes ;; +--help|*--help|*--help* ) help=yes; quiet=yes ;; --quiet|*--quiet|*--quiet* ) quiet=yes ;; --verbose|*--verbose|*--verbose*|-v|*-v|*-v* ) verbose=yes ;; * ) ;; @@ -267,40 +268,42 @@ # 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 $SEO ./configure \\ $configstatus -for arg -do -echo $arg |\ -sed -e 's:\([$\\]\):\\\1:g' \ --e 's:^::' \ --e 's:$: \\:' $configstatus +if [ .$help = .no ]; then +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 $SEO ./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 fi -echo '$*' $configstatus -echo '' $configstatus -chmod a+x $configstatus ## ## parse argument line options
cvs commit: apache-1.3 configure
rse 98/07/28 10:26:46
Modified:src CHANGES
.configure
Log:
One more portability fix for APACI shadow tree support: Swap order of awk and
sed in top-level configure script to avoid sed fails on some platforms (for
instance SunOS 4.1.3 and NCR SysV) because of the non-newline-termined output
of Awk.
PR: 2729
Revision ChangesPath
1.992 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.991
retrieving revision 1.992
diff -u -r1.991 -r1.992
--- CHANGES 1998/07/28 17:07:07 1.991
+++ CHANGES 1998/07/28 17:26:43 1.992
@@ -1,5 +1,10 @@
Changes with Apache 1.3.2
+ *) One more portability fix for APACI shadow tree support: Swap order of
awk
+ and sed in top-level configure script to avoid sed fails on some
+ platforms (for instance SunOS 4.1.3 and NCR SysV) because of the
+ non-newline-termined output of Awk. [Ralf S. Engelschall] PR#2729
+
*) PORT: NEC EWS4800 support.
[MATSUURA Takanori [EMAIL PROTECTED]]
1.42 +1 -1 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- configure 1998/07/27 14:39:22 1.41
+++ configure 1998/07/28 17:26:45 1.42
@@ -332,7 +332,7 @@
;;
--shadow)
# determine GNU platform triple
-gnutriple=`$aux/GuessOS | $AWK '{ printf(%s,$1); }' | sed -e
's:/:-:g'`
+gnutriple=`$aux/GuessOS | sed -e 's:/:-:g' | $AWK '{
printf(%s,$1); }'`
# create Makefile wrapper (the first time only)
if [ .`ls $top/src.* 2/dev/null` = . ]; then
if [ .$quiet = .no ]; then
cvs commit: apache-1.3 configure
rse 98/07/27 07:39:23
Modified:src CHANGES
.configure
Log:
Add workaround to top-level `configure' script for brain dead
`echo' commands which interpet escape sequences per default.
PR: 2654
Revision ChangesPath
1.988 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.987
retrieving revision 1.988
diff -u -r1.987 -r1.988
--- CHANGES 1998/07/25 12:43:18 1.987
+++ CHANGES 1998/07/27 14:39:20 1.988
@@ -1,5 +1,9 @@
Changes with Apache 1.3.2
+ *) Add workaround to top-level `configure' script for brain dead
+ `echo' commands which interpet escape sequences per default.
+ [Ralf S. Engelschall] PR#2654
+
*) Make sure that the path to the Perl interpreter is correctly
adjusted under `make install' also for the printenv CGI script.
[Ralf S. Engelschall] PR#2595
1.41 +32 -9 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- configure 1998/07/25 10:52:50 1.40
+++ configure 1998/07/27 14:39:22 1.41
@@ -124,6 +124,29 @@
fi
##
+## look for deadly broken echo commands which interpret escape
+## sequences `\XX' *per default*. For those we first try the -E option
+## and if it then is still broken we give a warning message.
+## If it works set the `Safe Echo Option' (SEO) variable.
+##
+
+SEO='' # CHANGE THIS VARIABLE HERE IF YOU HAVE PROBLEMS WITH ECHO!
+bytes=`echo $SEO '\1' | wc -c | awk '{ printf(%s, $1); }'`
+if [ .$bytes != .3 ]; then
+bytes=`echo -E '\1' | wc -c | awk '{ printf(%s, $1); }'`
+if [ .$bytes != .3 ]; then
+echo + Warning: Your 'echo' command is slightly broken.
+echo + It interprets escape sequences per default. We already
+echo + tried 'echo -E' but had no real success. If errors occur
+echo + please set the SEO variable in 'configure' manually to
+echo + the required 'echo' options, i.e. those which force your
+echo + 'echo' to not interpret escape sequences per default.
+else
+SEO='-E'
+fi
+fi
+
+##
## look for the best Awk we can find because some
## standard Awks are really braindead and cause
## problems for our scripts under some platforms.
@@ -266,7 +289,7 @@
if [ $# -eq 0 ]; then
echo ./configure $configstatus
else
-echo ./configure \\ $configstatus
+echo $SEO ./configure \\ $configstatus
for arg
do
echo $arg |\
@@ -968,10 +991,10 @@
if [ .$val != . ]; then
case $var in
CFLAGS|LDFLAGS|LIBS|INCLUDES|DEPS)
-echo s%^#*\\(EXTRA_$var=\\).*%\\1$val%g $sedsubst
+echo $SEO s%^#*\\(EXTRA_$var=\\).*%\\1$val%g $sedsubst
;;
*)
-echo s%^#*\\($var=\\).*%\\1$val%g $sedsubst
+echo $SEO s%^#*\\($var=\\).*%\\1$val%g $sedsubst
;;
esac
eval $var=\\; export $var
@@ -984,7 +1007,7 @@
for rule in $rules; do
name=`echo $rule | tr a-z A-Z`
eval val=\$rule_$rule
-echo s%^\\(Rule $name=\\).*%\\1$val%g $sedsubst
+echo $SEO s%^\\(Rule $name=\\).*%\\1$val%g $sedsubst
if [ $verbose = yes ]; then
echo + Rule $name=$val
fi
@@ -1020,17 +1043,17 @@
for module in $modules; do
eval add=\$module_$module
if [ $add = yes ]; then
-echo s%^.*\\(AddModule.*$module\\..*\\)%\\1%g $sedsubst
-echo s%^.*\\(SharedModule.*$module\\..*\\)%\\1%g $sedsubst
+echo $SEO s%^.*\\(AddModule.*$module\\..*\\)%\\1%g $sedsubst
+echo $SEO s%^.*\\(SharedModule.*$module\\..*\\)%\\1%g $sedsubst
m=yes [static]
else
-echo s%^.*\\(AddModule.*$module\\..*\\)%# \\1%g $sedsubst
-echo s%^.*\\(SharedModule.*$module\\..*\\)%# \\1%g $sedsubst
+echo $SEO s%^.*\\(AddModule.*$module\\..*\\)%# \\1%g $sedsubst
+echo $SEO s%^.*\\(SharedModule.*$module\\..*\\)%# \\1%g $sedsubst
m=no
fi
eval share=\$shared_$module
if [ $share = yes ]; then
-echo
s%^\\(.*\\)AddModule\\(.*$module\\.\\)[oa]\\(.*\\)%\\1SharedModule\\2so\\3%g
$sedsubst
+echo $SEO
s%^\\(.*\\)AddModule\\(.*$module\\.\\)[oa]\\(.*\\)%\\1SharedModule\\2so\\3%g
$sedsubst
m=yes [shared]
fi
if [ $verbose = yes ]; then
cvs commit: apache-1.3 configure
rse 98/07/12 02:25:47 Modified:src CHANGES .configure Log: Add conservative ticks around more egrep arguments in top-level configure to avoid problems under brain-dead platforms like Digital Unix (OSF1). PR: 2596 PS: The error on OSF1 also could mean that OSF1 really wants egrep -e pattern instead of egrep pattern. But when this is the problem other egreps in src/Configure also would fail. Because they don't we can assume that the problem for OSF1 is really the missing quotes because of the ^ char. Revision ChangesPath 1.961 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.960 retrieving revision 1.961 diff -u -r1.960 -r1.961 --- CHANGES 1998/07/11 10:56:03 1.960 +++ CHANGES 1998/07/12 09:25:44 1.961 @@ -1,4 +1,8 @@ Changes with Apache 1.3.1 + + *) Add conservative ticks around more egrep arguments in top-level configure + to avoid problems under brain-dead platforms like Digital Unix (OSF1). + [Ralf S. Engelschall] PR#2596 *) mod_rewrite created RewriteLock files under the uid of the parent process, thus the child processes had no write access to the files. 1.39 +2 -2 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- configure 1998/07/06 11:27:57 1.38 +++ configure 1998/07/12 09:25:46 1.39 @@ -789,9 +789,9 @@ conf_serveradmin=[EMAIL PROTECTED] conf_servername=new.host.name if [ .$confadjust = .1 ]; then -if [ .`egrep ^nobody: /etc/group` != . ]; then +if [ .`egrep '^nobody:' /etc/group` != . ]; then conf_group=nobody -if [ .`egrep ^nogroup: /etc/group` != . ]; then +if [ .`egrep '^nogroup:' /etc/group` != . ]; then conf_group=nogroup fi fi
cvs commit: apache-1.3 configure
rse 98/06/16 03:29:18 Modified:.configure Log: Merge in some changes between release and local CVS version of my patch Brian applied: - check for nogroup beside nobody, too. - correct space/tabs in sed patterns - cleanup indentation - cleanup ordering of subst vars Revision ChangesPath 1.36 +12 -9 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- configure 1998/06/16 03:59:02 1.35 +++ configure 1998/06/16 10:29:17 1.36 @@ -780,6 +780,9 @@ conf_group=#-1 if [ .`egrep ^nobody: /etc/group` != . ]; then conf_group=nobody +if [ .`egrep ^nogroup: /etc/group` != . ]; then +conf_group=nogroup +fi fi conf_port=80 if [ .`id | grep root` = . ]; then @@ -808,15 +811,15 @@ hostname=`echo $hostname | sed -e 's/\..*//'` domainname=; if [ -f /etc/resolv.conf ]; then -domainname=`egrep '^[ ]*domain' /etc/resolv.conf |\ - sed -e 's/.*domain//' -e 's/^[ ]*//' \ - -e 's/^ *//' -e 's/^ *//' \ +domainname=`egrep '^[ ]*domain' /etc/resolv.conf |\ + sed -e 's/.*domain//' -e 's/^[ ]*//' \ + -e 's/^ *//' -e 's/^*//' \ -e 's/^\.//' -e 's/^/./'` if [ .$domainname = . ]; then domainname=`egrep '^[ ]*search' /etc/resolv.conf |\ - sed -e 's/.*search//' -e 's/^[ ]*//' \ - -e 's/^ *//' -e 's/^ *//' \ - -e 's/ .*//' -e 's/^\.//' -e 's/^/./'` + sed -e 's/.*search//' -e 's/^[ ]*//' \ + -e 's/^ *//' -e 's/^*//' \ + -e 's/ .*//' -e 's/^\.//' -e 's/^/./'` fi fi conf_serveradmin=[EMAIL PROTECTED] @@ -902,13 +905,13 @@ -e [EMAIL PROTECTED]@%$suexec%g \ -e [EMAIL PROTECTED]@%$suexec_caller%g \ -e [EMAIL PROTECTED]@%$suexec_userdir%g \ +-e [EMAIL PROTECTED]@%$suexec_uidmin%g \ +-e [EMAIL PROTECTED]@%$suexec_gidmin%g \ +-e [EMAIL PROTECTED]@%$suexec_safepath%g \ -e [EMAIL PROTECTED]@%$conf_group%g \ -e [EMAIL PROTECTED]@%$conf_port%g \ -e [EMAIL PROTECTED]@%$conf_serveradmin%g \ -e [EMAIL PROTECTED]@%$conf_servername%g \ --e [EMAIL PROTECTED]@%$suexec_uidmin%g \ --e [EMAIL PROTECTED]@%$suexec_gidmin%g \ --e [EMAIL PROTECTED]@%$suexec_safepath%g \ -e [EMAIL PROTECTED]@%$build_support%g \ -e [EMAIL PROTECTED]@%$install_support%g \ -e [EMAIL PROTECTED]@%$clean_support%g \
cvs commit: apache-1.3 configure
rse 98/06/13 04:24:11
Modified:src CHANGES
.configure
Log:
Portability fix for APACI shadow tree support: Swap order of awk and sed in
top-level configure script to avoid sed fails on some platforms (for instance
SunOS 4.1.3 and NCR SysV) because of the non-newline-termined output of Awk.
Submitted by: Bill Houle [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall
PR: 2435
Revision ChangesPath
1.912 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.911
retrieving revision 1.912
diff -u -r1.911 -r1.912
--- CHANGES 1998/06/12 15:53:21 1.911
+++ CHANGES 1998/06/13 11:24:07 1.912
@@ -1,5 +1,10 @@
Changes with Apache 1.3.1
+ *) Portability fix for APACI shadow tree support: Swap order of awk and sed
+ in top-level configure script to avoid sed fails on some platforms (for
+ instance SunOS 4.1.3 and NCR SysV) because of the non-newline-termined
+ output of Awk. [Bill Houle [EMAIL PROTECTED]] PR#2435
+
*) Improve performance of directory listings (mod_autoindex) by comparing
integer keys (last-modified and size) as integers rather than converting
them to strings first. Also use a set of explicit byte tests rather
1.32 +1 -1 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- configure 1998/06/05 07:15:16 1.31
+++ configure 1998/06/13 11:24:10 1.32
@@ -278,7 +278,7 @@
echo ## Apache Makefile (shadow wrapper) Makefile
echo ## Makefile
echo Makefile
-echo GNUTRIPLE=\`$aux/GuessOS | $AWK '{
printf(\%s\,\$\$1); }' | sed -e 's:/:-:g'\` Makefile
+echo GNUTRIPLE=\`$aux/GuessOS | sed -e 's:/:-:g' | $AWK '{
printf(\%s\,\$\$1); }'\` Makefile
echo Makefile
echo all build install install-quiet clean distclean:
Makefile
echo@\$(MAKE) -f Makefile.\$(GNUTRIPLE) \$(MFLAGS)
\$@ Makefile
cvs commit: apache-1.3 configure
rse 98/05/29 13:41:57 Modified:.configure Log: We use [ all the time and are not as paranoid as GNU Autoconf itself. Revision ChangesPath 1.29 +2 -2 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- configure 1998/05/29 07:59:59 1.28 +++ configure 1998/05/29 20:41:57 1.29 @@ -121,8 +121,8 @@ for dir in $PATH; do OIFS2=$IFS IFS=$DIFS for exe in perl5 perl miniperl; do -if test -f $dir/$exe; then -if test -x $dir/$exe; then +if [ -f $dir/$exe ]; then +if [ -x $dir/$exe ]; then PERL=$dir/$exe break 2 fi
cvs commit: apache-1.3 configure
rse 98/05/27 07:57:38 Modified:src CHANGES .configure Log: Transform the configure message You need root priviledges for suEXEC from a fatal error into a (more friendly) warning because the building (make) of Apache we can allow, of course. Root priviledges are needed only for the installation step (make install). So make sure the user is aware of this fact but let him proceed as long as he can. PR: 2288 Revision ChangesPath 1.864 +7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.863 retrieving revision 1.864 diff -u -r1.863 -r1.864 --- CHANGES 1998/05/27 14:01:29 1.863 +++ CHANGES 1998/05/27 14:57:36 1.864 @@ -1,4 +1,11 @@ Changes with Apache 1.3b8 + + *) Transform the configure message You need root priviledges for suEXEC + from a fatal error into a (more friendly) warning because the building + (make) of Apache we can allow, of course. Root priviledges are needed + only for the installation step (make install). So make sure the + user is aware of this fact but let him proceed as long as he can. + [Ralf S. Engelschall] PR#2288 *) Renamed three more functions to common ap_ prefix which we missed at the Big Symbol Renaming because they're #defines and not real C functions: 1.26 +6 -4 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- configure 1998/05/12 12:13:48 1.25 +++ configure 1998/05/27 14:57:37 1.26 @@ -564,10 +564,6 @@ esac ;; suexec ) -if [ .`id | grep root` = . ]; then -echo configure:Error: suEXEC support needs root priviledges for installation 12 -exit 1 -fi suexec=1 ;; esac @@ -685,6 +681,12 @@ ## ## a few warnings ## +if [ .$suexec = .1 ]; then +if [ .`id | grep root` = . ]; then +echo + Warning: You enabled the suEXEC feature. Be aware that you need 12 +echo + root priviledges for this, at the latest at the installation step. 12 +fi +fi if [ .$PERL = .no-perl-on-this-system ]; then if [ .$quiet = .no ]; then echo + Warning: no Perl interpreter available for support scripts.
cvs commit: apache-1.3 configure
rse 98/04/26 10:57:24
Modified:.configure
Log:
Some more back-ported cleanups for the configure script.
Revision ChangesPath
1.19 +7 -7 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure 1998/04/26 16:20:58 1.18
+++ configure 1998/04/26 17:57:23 1.19
@@ -259,7 +259,7 @@
;;
--shadow)
# determine GNU platform triple
-gnutriple=`$src/helpers/GuessOS | awk '{ printf(%s,$1); }' |
sed -e 's:/:-:g'`
+gnutriple=`$aux/GuessOS | awk '{ printf(%s,$1); }' | sed -e
's:/:-:g'`
# create Makefile wrapper
if [ .$quiet = .no ]; then
echo + creating Makefile (shadow wrapper)
@@ -268,7 +268,7 @@
echo ## Apache Makefile (shadow wrapper) Makefile
echo ## Makefile
echo Makefile
-echo GNUTRIPLE=\`$src/helpers/GuessOS | awk '{
printf(\%s\,\$\$1); }' | sed -e 's:/:-:g'\` Makefile
+echo GNUTRIPLE=\`$aux/GuessOS | awk '{ printf(\%s\,\$\$1); }'
| sed -e 's:/:-:g'\` Makefile
echo Makefile
echo all build install install-quiet clean distclean:
Makefile
echo@\$(MAKE) -f Makefile.\$(GNUTRIPLE) \$(MFLAGS) \$@
Makefile
@@ -640,7 +640,7 @@
for var in prefix exec_prefix bindir sbindir \
libexecdir mandir sysconfdir datadir \
localstatedir includedir; do
-eval val=\$$var;
+eval val=\\$$var\;
val=`echo $val | sed -e 's:/*$::'`
eval $var=\$val\
case $var in
@@ -650,7 +650,7 @@
*apache | *apache* ) ;;
* ) eval customized=\$customized_$var
if [ .$customized = .0 ]; then
- eval $var=\$$var/apache
+ eval $var=\\$$var/apache\
fi
;;
esac
@@ -790,7 +790,7 @@
OIFS=$IFS IFS=$DIFS
for var in CC OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LDFLAGS_SHLIB \
LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do
-eval val=\$$var;
+eval val=\\$$var\;
if [ .$val != . ]; then
case $var in
CFLAGS|LDFLAGS|LIBS|INCLUDES)
@@ -882,9 +882,9 @@
## $src/Configure script with our custom Configuration.apaci file
##
if [ .$quiet = .yes ]; then
-(cd $src; CFLAGS= ./Configure -file Configuration.apaci /dev/null);
+(cd $src; ./Configure -file Configuration.apaci /dev/null);
else
-(cd $src; CFLAGS= ./Configure -file Configuration.apaci |\
+(cd $src; ./Configure -file Configuration.apaci |\
sed -e '/^Using config file:.*/d' \
-e s:Makefile in :Makefile in $src\\/: \
-e s:Makefile\$:Makefile in $src:)
cvs commit: apache-1.3 configure
rse 98/04/19 23:30:59 Modified:.configure Log: Bugfix: libexecdir is based on exec_prefix, so the relative variant has to use exec_prefix when trying to reduce the prefix. Revision ChangesPath 1.12 +1 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- configure 1998/04/19 16:03:38 1.11 +++ configure 1998/04/20 06:30:59 1.12 @@ -646,7 +646,7 @@ ## localstatedir_relative=`echo $localstatedir | 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:^$prefix/*:: -e 's:\(.\)$:\1/:'` +libexecdir_relative=`echo $libexecdir | sed -e s:^$exec_prefix/*:: -e 's:\(.\)$:\1/:'` ## ## check and debug
cvs commit: apache-1.3 configure
rse 98/04/15 03:03:47 Modified:.configure Log: Last minute fix: Be even more friendly and conservative: Only append the /apache prefix to installation paths when the PREFIX does not contain it _AND_ the user didn't customize it via explicit options. Revision ChangesPath 1.10 +16 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure 1998/04/15 06:23:08 1.9 +++ configure 1998/04/15 10:03:46 1.10 @@ -141,6 +141,13 @@ localstatesubdir_logs='logs' includedir='$prefix/include' +# customization flags for +# automatic apache suffix +customized_sysconfdir=0 +customized_datadir=0 +customized_localstatedir=0 +customized_includedir=0 + # check and debug layout=0 @@ -324,15 +331,19 @@ ;; --sysconfdir=*) sysconfdir=$apc_optarg +customized_sysconfdir=1 ;; --datadir=*) datadir=$apc_optarg +customized_datadir=1 ;; --localstatedir=*) localstatedir=$apc_optarg +customized_localstatedir=1 ;; --includedir=*) includedir=$apc_optarg +customized_includedir=1 ;; --compat) prefix='/usr/local/apache' @@ -600,7 +611,11 @@ eval val=\$$var case $val in *apache | *apache* ) ;; - * ) eval $var=\$$var/apache ;; + * ) eval customized=\$customized_$var + if [ .$customized = .0 ]; then + eval $var=\$$var/apache + fi + ;; esac ;; esac
cvs commit: apache-1.3 configure
rse 98/04/14 02:02:38
Modified:.configure
Log:
Make again --enable-module=most as conservative as it can.
Only modules which we can really expect to be workable
should be included.
Revision ChangesPath
1.7 +3 -2 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure 1998/04/10 10:34:31 1.6
+++ configure 1998/04/14 09:02:36 1.7
@@ -440,10 +440,11 @@
eval module_${module}=yes
done
module_auth_db=no # not all platforms have
-ldb
+ module_mmap_static=no # not all platforms have
mmap()
+ module_so=no # not all platforms have
dlopen()
+ module_example=no # only for developers
module_log_agent=no # deprecated
module_log_referer=no # deprecated
- module_example=no # only for developers
- module_so=no # not all platforms have
dlopen()
;;
* )
eval exists=\$module_${apc_optarg}
cvs commit: apache-1.3 configure
rse 98/04/14 12:08:09 Modified:.configure Log: Make sure the includedir gets PREFIX/include/apache if PREFIX not already contains the words apache to make sure Apache headers do not bristle a standard include directory. Just the same behaviour as already for sysconfdir, datadir and localstatedir. Thanks to Marc for discovering this bug. Revision ChangesPath 1.8 +1 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- configure 1998/04/14 09:02:36 1.7 +++ configure 1998/04/14 19:08:09 1.8 @@ -596,7 +596,7 @@ val=`echo $val | sed -e 's:/*$::'` eval $var=\$val\ case $var in - sysconfdir|datadir|localstatedir ) + sysconfdir|datadir|localstatedir|includedir ) eval val=\$$var case $val in *apache | *apache* ) ;;
