coar 97/07/16 05:25:36
Modified: src CHANGES Configure
Log:
Configure was treating the creation of src/Makefile so
specifically that it wasn't propagating options like CC
and OPTIM to other Makefiles (such as support/Makefile).
Options are now put into the foundation Makfile.config
rather than directly into src/Makefile.
PR: 666, 834
Revision Changes Path
1.338 +4 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.337
retrieving revision 1.338
diff -C3 -r1.337 -r1.338
*** CHANGES 1997/07/15 16:08:31 1.337
--- CHANGES 1997/07/16 12:25:33 1.338
***************
*** 1,5 ****
--- 1,9 ----
Changes with Apache 1.3
+ *) Configure fixed to correctly propagate user-selected options and
+ settings (such as CC and OPTIM) to Makefiles other than
+ src/Makefile (notably support/Makefile). [Ken Coar] PR#666, #834
+
*) IndexOptions SuppressHTMLPreamble now causes the actual HTML of
directory indices to start with the contents of the HeaderName file
if there is one. If there isn't one, the behaviour is unchanged.
1.109 +21 -23 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.108
retrieving revision 1.109
diff -C3 -r1.108 -r1.109
*** Configure 1997/07/14 10:20:00 1.108
--- Configure 1997/07/16 12:25:34 1.109
***************
*** 124,130 ****
#
# Now add Makefile additions and Rules
#
! awk >>Makefile <$tmpfile '\
BEGIN { print "# Makefile options inherited from Configure"; \
print "###############"; \
} \
--- 124,130 ----
#
# Now add Makefile additions and Rules
#
! awk >Makefile.config <$tmpfile '\
BEGIN { print "# Makefile options inherited from Configure"; \
print "###############"; \
} \
***************
*** 524,530 ****
# Show the final values of the rules
! echo "###############" > Makefile.config
echo "# Platform: $OS" >> Makefile.config
echo "# Final Rules:" >> Makefile.config
echo "# Rule WANTHSREGEX=$RULE_WANTHSREGEX" >> Makefile.config
--- 524,530 ----
# Show the final values of the rules
! echo "###############" >> Makefile.config
echo "# Platform: $OS" >> Makefile.config
echo "# Final Rules:" >> Makefile.config
echo "# Rule WANTHSREGEX=$RULE_WANTHSREGEX" >> Makefile.config
***************
*** 544,576 ****
# then we use the "found" location of COMPILERS above
# 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
! if [ "x$COMPILER" = "x" ]; then
! echo "Error: could not find any of these C compilers"
! echo " anywhere in your PATH: $lookedfor"
! echo "Configure terminated"
! exit 1
! fi
! CC=$COMPILER
fi
! echo " + setting C compiler to $CC"
fi
#
# Ditto for optimization
#
! if egrep "^OPTIM[ ]*=" Makefile > /dev/null; then
! OPTIM="" # ditto
else
! if [ "x$OPTIM" = "x" ]; then
! OPTIM="-O2"
! fi
! echo " + setting C compiler optimization-level to $OPTIM"
fi
#
# Are they using the status monitor module? If so, check
--- 544,571 ----
# then we use the "found" location of COMPILERS above
# and set a "safe" optimization level
#
! TCC=`egrep '^CC[ ]*=' Makefile.config | tail -1 | awk -F= '{print $2}'`
! if [ "x$CC" = "x" ]; then
! if [ "x$COMPILER" = "x" ]; then
! echo "Error: could not find any of these C compilers"
! echo " anywhere in your PATH: $lookedfor"
! echo "Configure terminated"
! exit 1
fi
! CC=$COMPILER
fi
+ echo " + setting C compiler to $CC"
#
# Ditto for optimization
#
! TOPTIM=`egrep '^OPTIM[ ]*=' Makefile.config | tail -1 | awk -F=
'{print $2}'`
! if [ "x$TOPTIM" = "x" ]; then
! OPTIM="-O2"
else
! OPTIM=$TOPTIM
fi
+ echo " + setting C compiler optimization-level to $OPTIM"
#
# Are they using the status monitor module? If so, check
***************
*** 620,630 ****
#
# Good enough
#
echo >> Makefile
! if [ "x$CC" != "x" ]; then
echo "CC=$CC" >> Makefile.config
fi
! if [ "x$OPTIM" != "x" ]; then
echo "OPTIM=$OPTIM" >> Makefile.config
fi
echo "CFLAGS1=$CFLAGS">> Makefile.config
--- 615,628 ----
#
# Good enough
#
+ # Add the CC and OPTIM values if they weren't specified in the
+ # Configuration file and we had to calculate them.
+ #
echo >> Makefile
! if [ "x$TCC" = "x" ]; then
echo "CC=$CC" >> Makefile.config
fi
! if [ "x$TOPTIM" = "x" ]; then
echo "OPTIM=$OPTIM" >> Makefile.config
fi
echo "CFLAGS1=$CFLAGS">> Makefile.config
