cvs commit: apachen/src CHANGES Configure
dgaudet 97/11/06 13:57:39
Modified:src CHANGES Configure
Log:
A sed command in the Configure script pushed the edge of POSIXness,
breaking on some systems
PR: 1368
Submitted by: Bhaba R.Misra <[EMAIL PROTECTED]>
Reviewed by:Dean Gaudet, Jim Jagielski, Martin Kraemer
Revision ChangesPath
1.489 +3 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- CHANGES 1997/11/06 10:46:58 1.488
+++ CHANGES 1997/11/06 21:57:36 1.489
@@ -1,4 +1,7 @@
Changes with Apache 1.3b3
+
+ *) A sed command in the Configure script pushed the edge of POSIXness,
+ breaking on some systems. [Bhaba R.Misra <[EMAIL PROTECTED]>] PR#1368
*) Solaris >= 2.5 was totally broken due to a mess up using pthread
mutexes. [Roy Fielding, Dean Gaudet]
1.169 +1 -1 apachen/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- Configure 1997/11/05 12:48:12 1.168
+++ Configure 1997/11/06 21:57:37 1.169
@@ -1063,7 +1063,7 @@
# it's responsible for the rest of its Makefile
:
else
- basedir=`echo $moddir | sed 's/^[^/]*\///g'`
+ basedir=`echo $moddir | sed '[EMAIL PROTECTED]/]*/@@g'`
awk >> $moddir/Makefile < $tmpfile '
BEGIN {
printf "OBJS="
cvs commit: apachen/src CHANGES Configure
dgaudet 97/11/02 20:33:19 Modified:src CHANGES Configure Log: Warn user about default path change if /usr/local/etc/httpd is found. Submitted by: Lars Eilebrecht Reviewed by: Martin Kraemer, Dean Gaudet Revision ChangesPath 1.483 +3 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.482 retrieving revision 1.483 diff -u -r1.482 -r1.483 --- CHANGES 1997/10/30 19:20:48 1.482 +++ CHANGES 1997/11/03 04:33:16 1.483 @@ -1,5 +1,8 @@ Changes with Apache 1.3b3 + *) Warn user that default path has changed if /usr/local/etc/httpd + is found on the system. [Lars Eilebrecht] + *) Various mod_mime_magic bug fixes and cleanups: Uncompression should work, it should work on WIN32, and a few resource leaks and abort conditions are fixed. 1.166 +18 -0 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- Configure 1997/10/27 19:10:33 1.165 +++ Configure 1997/11/03 04:33:17 1.166 @@ -98,6 +98,24 @@ if [ -f modules.c ] ; then mv modules.c modules.c.bak; fi +# If we find the directory /usr/local/etc/httpd and there is +# no HTTPD_ROOT flag set in the Configuration file we assume +# that the user was using the old default root directory +# and issue a notice about it. +# + +test ! -d /usr/local/etc/httpd/ \ + || if ! egrep '^EXTRA_CFLAGS.*HTTPD_ROOT' $file >/dev/null +then + echo " | Please note that the default httpd root directory has changed" + echo " | from '/usr/local/etc/httpd/' to '/usr/local/apache/.'" + echo " | You may add '-DHTTPD_ROOT=\\\"/usr/local/etc/httpd\\\"' to EXTRA_CFLAGS" + echo " | in your Configuration file (and re-run Configure) or start" + echo " | httpd with the option '-d /usr/local/etc/httpd' if you still" + echo " | want to use the old root directory for your server." +fi + + # Start creating the Makefile. We add some comments and # then fold in the modules that were included in Configuration #
cvs commit: apachen/src CHANGES Configure
coar97/09/03 08:56:13
Modified:src CHANGES Configure
Log:
Fix a problem caused by a continuation mark being put on the
last line of a multi-line statement. Also, force Paul to
take credit for his excellent changes to the Configure process.
Revision ChangesPath
1.427 +4 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- CHANGES 1997/09/02 16:19:14 1.426
+++ CHANGES 1997/09/03 15:56:07 1.427
@@ -1,5 +1,9 @@
Changes with Apache 1.3a2
+ *) Modules and core routines are now put into libraries, which
+ simplifies the link line tremendously (among other advantages).
+ [Paul Sutton]
+
*) Some of the MD5 names defined in Apache have been renamed to have
an `ap_' prefix to avoid conflicts with routines supplied by
external libraries. [Ken Coar]
1.146 +19 -8 apachen/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- Configure 1997/09/03 08:30:04 1.145
+++ Configure 1997/09/03 15:56:08 1.146
@@ -854,27 +854,38 @@
fi
done
-# Add the module targets to the Makefile. Do not add inidividual object
+# Add the module targets to the Makefile. Do not add individual object
# targets for auto-generated directories.
awk -v AUTODIRS="$AUTODIRS" >>Makefile <$tmpfile '\
BEGIN { split ( AUTODIRS, tmp, / /); \
for ( key in tmp ) { autodirs[tmp[key]] = 1; } } \
/^Module/ { modules[n++] = $3 } \
/^%Module/ { modules[n++] = $3 } \
- END { print "MODULES=\\"; \
+ END { print "MODULES= \\"; \
for (i = 0; i < n; ++i) { \
split ( modules[i], pp, /\//); \
dir = pp[1] "/" pp[2] ; \
if ( dir in autodirs ) { continue; }\
- else printf (" %s\\\n", modules[i]); \
+ else printf (" %s \\\n", modules[i]); \
} \
}'
-# Now add the auto-generated library targets
-for lib in $AUTOLIBS; do
- echo " $lib \\" >> Makefile
-done
-echo >> Makefile
+# Now add the auto-generated library targets. Need to use awk so we
+# don't hang a continuation on the last line.
+
+awk -v AUTOLIBS="$AUTOLIBS" >>Makefile
cvs commit: apachen/src CHANGES Configure INSTALL
jim 97/08/26 18:12:22
Modified:src CHANGES Configure INSTALL
Log:
Depreciate the -make option for Configure. We now create Makefile
on the fly and depend on the existance of Makefile.tmpl.
Revision ChangesPath
1.422 +3 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- CHANGES 1997/08/26 00:00:50 1.421
+++ CHANGES 1997/08/27 01:12:18 1.422
@@ -1,5 +1,8 @@
Changes with Apache 1.3a2
+ *) Configure no longer accepts the -make option, since it creates
+ Makefile on the fly based on Makefile.tmpl and Configuration.
+
*) Apache now gracefully shuts down when it receives a SIGTERM, instead
of forcibly killing off all its processes and exiting without
cleaning up. [Alexei Kosut]
1.143 +5 -12 apachen/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- Configure 1997/08/26 01:02:51 1.142
+++ Configure 1997/08/27 01:12:19 1.143
@@ -24,12 +24,11 @@
tmpfile=htconf.$$
tmpfile2=$tmpfile.2
tmpfile3=$tmpfile.3
-makefile_tmpl=Makefile.tmpl
SRCDIR=`pwd`
-## Now handle any arguments, which, for now, are -file and -make
-## to select alternate Configuration and Makefile.tmpl files
+## Now handle any arguments, which, for now, is -file
+## to select an alternate Configuration file
##
while [ "x$1" != "x" ]; do
if [ "x$1" = "x-file" ] ; then
@@ -38,19 +37,12 @@
echo "$file does not exist or is not readable."
exit 1
fi
- elif [ "x$1" = "x-make" ] ; then
-shift 1; makefile_tmpl=$1; shift 1
-if [ ! -r $makefile_tmpl ]; then
- echo "$makefile_tmpl does not exist or is not readable."
- exit 1
-fi
else
echo "Ignoring command line option '$1'"
shift 1
fi
done
echo "Using config file: $file"
-echo "Using Makefile template file: $makefile_tmpl"
if [ ! -r $file ]; then
echo "Can't see or read \"$file\""
@@ -104,8 +96,9 @@
# Start creating the Makefile. We add some comments and
# then fold in the modules that were included in Configuration
#
+echo "Creating Makefile"
echo "#" > Makefile
-echo "# Makefile automatically generated from $makefile_tmpl" >> Makefile
+echo "# Makefile automatically generated from Makefile.tmpl" >> Makefile
echo "# and configuration file by Apache config script." >> Makefile
echo "# Hand-edited changes will be lost if the config script" >> Makefile
echo "# is re-run" >> Makefile
@@ -893,7 +886,7 @@
# ./Makefile
#
cat Makefile.config >> Makefile
-sed -e "s#@@Configuration@@#$file#" "$makefile_tmpl" >>Makefile
+sed -e "s#@@Configuration@@#$file#" "Makefile.tmpl" >>Makefile
awk >>Makefile <$tmpfile \
'($1 == "Module" && $3 ~ /modules\//) { printf "%s: modules/last-built ;
@cat /dev/null\n\n", $3, $3}'
1.18 +14 -6 apachen/src/INSTALL
Index: INSTALL
===
RCS file: /export/home/cvs/apachen/src/INSTALL,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- INSTALL 1997/08/09 00:55:52 1.17
+++ INSTALL 1997/08/27 01:12:19 1.18
@@ -28,10 +28,15 @@
% ./Configure
Using config file: Configuration
- Using Makefile template file: Makefile.tmpl
+ Creating Makefile
+ configured for platform
- + setting C compiler to *
+ + setting C compiler to
+ + Adding selected modules
+ doing sanity check on compiler and options
+ Creating Makefile in support
+ Creating Makefile in main
+ Creating Makefile in os/unix
+ Creating Makefile in modules/standard
%
This generates new versions of the Makefile and of modules.c. (If
@@ -39,14 +44,17 @@
% ./Configure -file Configuration.ai
Using config file: Configuration.ai
- Using Makefile template file: Makefile.tmpl
+ Creating Makefile
+ configured for platform
- + setting C compiler to *
+ + setting C compiler to
+ + Adding selected modules
+ doing sanity check on compiler and options
+ Creating Makefile in support
+ Creating Makefile in main
+ Creating Makefile in os/unix
+ Creating Makefile in modules/standard
%
- (*: Depending on Configuration and your system, Configure
- may not print these lines. That's OK)
