rse 98/06/17 05:55:15
Modified: src CHANGES . INSTALL configure Log: Be friendly to package maintainers and allow them to disable the APACI configuration adjustments (Group, Port, ServerName, ServerAdmin) via --without-confadjust because when building packages this can be problematic to them. Revision Changes Path 1.924 +4 -1 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.923 retrieving revision 1.924 diff -u -r1.923 -r1.924 --- CHANGES 1998/06/17 07:10:38 1.923 +++ CHANGES 1998/06/17 12:55:12 1.924 @@ -6,7 +6,10 @@ *) Let APACI's configure script determine some configuration parameters (Group, Port, ServerAdmin, ServerName) via some intelligent tests to remove some of the classical hurdles for new users when setting up - Apache. [Ralf S. Engelschall] + Apache. This is done per default because it is useful for the average + user. Package authors can use the --without-confadjust option to disable + these configuration adjustments. + [Ralf S. Engelschall] *) Added an EXTRA_DEPS configuration parameter which can be used to add an extra Makefile dependency for the httpd target, for instance 1.31 +6 -0 apache-1.3/INSTALL Index: INSTALL =================================================================== RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- INSTALL 1998/05/22 07:25:01 1.30 +++ INSTALL 1998/06/17 12:55:14 1.31 @@ -155,6 +155,7 @@ [--with-perl=FILE] [--without-support] + [--without-confadjust] Use the CC, OPTIM, CFLAGS, INCLUDES, LDFLAGS, LIBS, CFLAGS_SHLIB, LD_SHLIB, LDFLAGS_SHLIB, LDFLAGS_SHLIB_EXPORT and RANLIB environment @@ -264,6 +265,11 @@ installation of support tools from the src/support/ area. This can be useful when you have compilation problems with one or more of these not programs on your platform or if you just don't need them. + + Use the --without-confadjust option to explicitly disable some built + user/situation dependent adjustments to the config files (Group, Port, + ServerAdmin, ServerName, etc.). This is usually only interesting for + vendor package maintainers who wants to force the keeping of defaults. Use the --enable-suexec option to enable the suEXEC feature by building and installing the "suexec" support program. Use --suexec-caller=UID to 1.37 +46 -35 apache-1.3/configure Index: configure =================================================================== RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- configure 1998/06/16 10:29:17 1.36 +++ configure 1998/06/17 12:55:14 1.37 @@ -176,6 +176,9 @@ # with support tools support=1 +# with adjustments +confadjust=1 + # determine rules rules="" rulelist="" @@ -385,6 +388,7 @@ 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-suexec enable the suEXEC feature" @@ -669,6 +673,9 @@ --without-support) support=0 ;; + --without-confadjust) + confadjust=0 + ;; --suexec-caller=*) suexec_caller="$apc_optarg" suexec_ok=1 @@ -778,53 +785,57 @@ ## determine special configuration parameters ## 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 - conf_port="8080" -fi -username="$LOGNAME" -if [ ".$username" = . ]; then - username="$USER" +conf_serveradmin="[EMAIL PROTECTED]" +conf_servername="new.host.name" +if [ ".$confadjust" = .1 ]; then + if [ ".`egrep ^nobody: /etc/group`" != . ]; then + conf_group="nobody" + if [ ".`egrep ^nogroup: /etc/group`" != . ]; then + conf_group="nogroup" + fi + fi + if [ ".`id | grep root`" = . ]; then + conf_port="8080" + fi + username="$LOGNAME" if [ ".$username" = . ]; then - username="`whoami 2>/dev/null | sed -e 's/\n$//'`" + username="$USER" if [ ".$username" = . ]; then - username="`who am i 2>/dev/null | cut '-d ' -f1`" + username="`whoami 2>/dev/null | sed -e 's/\n$//'`" if [ ".$username" = . ]; then - username="unknown" + username="`who am i 2>/dev/null | cut '-d ' -f1`" + if [ ".$username" = . ]; then + username="unknown" + fi fi fi fi -fi -hostname="`uname -n | sed -e 's/\n$//'`" -if [ ".$hostname" = . ]; then - hostname="`hostname | sed -e 's/\n$//'`" + hostname="`uname -n | sed -e 's/\n$//'`" if [ ".$hostname" = . ]; then - hostname="hostname" + hostname="`hostname | sed -e 's/\n$//'`" + if [ ".$hostname" = . ]; then + hostname="hostname" + fi fi -fi -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/^ *//' \ - -e 's/^\.//' -e 's/^/./'`" - if [ ".$domainname" = . ]; then - domainname="`egrep '^[ ]*search' /etc/resolv.conf |\ - sed -e 's/.*search//' -e 's/^[ ]*//' \ + 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/^ *//' \ - -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/^/./'`" + fi fi + conf_serveradmin="[EMAIL PROTECTED]" + conf_servername="$hostname$domainname" fi -conf_serveradmin="[EMAIL PROTECTED]" -conf_servername="$hostname$domainname" - + ## ## determine prefix-relative paths for directories ## because Apache supports them for the -d and -f