jim 97/05/12 17:20:32
Modified: src CHANGES Configure
Log:
Allow whitespace in Configuration when appropriate
Revision Changes Path
1.272 +5 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.271
retrieving revision 1.272
diff -C3 -r1.271 -r1.272
*** CHANGES 1997/05/11 22:30:36 1.271
--- CHANGES 1997/05/13 00:20:29 1.272
***************
*** 1,5 ****
--- 1,10 ----
Changes with Apache 1.2
+ *) Configure changes: Allow for whitespace at the start of a
+ Module declaration. Also, be more understanding about the
+ CC=/OPTIM= format in Configuration. Finally, fix compiler
+ flags if using HP-UX's cc compiler. [Jim Jagielski]
+
*) Subrequests and internal redirect now inherit the_request from the
original request-line. [Roy Fielding]
1.96 +7 -5 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.95
retrieving revision 1.96
diff -C3 -r1.95 -r1.96
*** Configure 1997/05/10 21:53:53 1.95
--- Configure 1997/05/13 00:20:30 1.96
***************
*** 45,56 ****
fi
# First, strip comments and blank lines and then change Rules to comments
sed 's/#.*//' $file | \
sed '/^[ ]*$/d' | \
sed 's/[ ]*$//' | \
! sed 's/^Rule[ ]*/##Rule:/' \
! > $tmpfile
# Check for syntax errors...
--- 45,58 ----
fi
# First, strip comments and blank lines and then change Rules to comments
+ # and then remove whitespace before Module declarations
sed 's/#.*//' $file | \
sed '/^[ ]*$/d' | \
sed 's/[ ]*$//' | \
! sed 's/^Rule[ ]*/##Rule:/' | \
! sed 's/^[ ]*Module/Module/' | \
! sed 's/^[ ]*%Module/%Module/' > $tmpfile
# Check for syntax errors...
***************
*** 169,175 ****
#
# We now look for popular compilers. As with ranlib, we
! # do this early but because some options may depend
# on which compiler we use/find
#
for compilers in "gcc" "cc" "acc" "c89"
--- 171,177 ----
#
# We now look for popular compilers. As with ranlib, we
! # do this early because some options may depend
# on which compiler we use/find
#
for compilers in "gcc" "cc" "acc" "c89"
***************
*** 494,500 ****
# and set a "safe" optimization level
#
! if grep "CC=" Makefile > /dev/null; then
CC="" # clear it just in case
else
if [ "x$CC" = "x" ]; then
--- 496,502 ----
# and set a "safe" optimization level
#
! if egrep "^CC[ ]*=" Makefile > /dev/null; then
CC="" # clear it just in case
else
if [ "x$CC" = "x" ]; then
***************
*** 512,518 ****
#
# Ditto for optimization
#
! if grep "OPTIM=" Makefile > /dev/null; then
OPTIM="" # ditto
else
if [ "x$OPTIM" = "x" ]; then
--- 514,520 ----
#
# Ditto for optimization
#
! if egrep "^OPTIM[ ]*=" Makefile > /dev/null; then
OPTIM="" # ditto
else
if [ "x$OPTIM" = "x" ]; then
