jim 96/10/24 14:17:36
Modified: src Configure INSTALL
Log:
Configure changes: streamline code
Revision Changes Path
1.32 +31 -17 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.31
retrieving revision 1.32
diff -C3 -r1.31 -r1.32
*** Configure 1996/10/23 17:13:04 1.31
--- Configure 1996/10/24 21:17:34 1.32
***************
*** 1,6 ****
#!/bin/sh
! # $Id: Configure,v 1.31 1996/10/23 17:13:04 jim Exp $
! trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
# Dont like it? Inspired to do something better? Go for it.
--- 1,6 ----
#!/bin/sh
! # $Id: Configure,v 1.32 1996/10/24 21:17:34 jim Exp $
! trap 'rm -f $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
# Dont like it? Inspired to do something better? Go for it.
***************
*** 295,321 ****
# Now that _that's_ done, get on with it
#
! echo "Configured for $OS platform"
#
! # Handle the setting of CC and OPTIM. The values in Configure
! # have priority. If not set there, then we check if they were
! # set above. If so, then we honor that; if not, then we set some
! # defaults (gcc and -O2)
! #
! if COMPILER=`./helpers/GuessWhere gcc`; then : ;
! else
! if COMPILER=`./helpers/GuessWhere cc`; then : ;
! else
! COMPILER="no-compiler-found"
fi
! fi
if grep "CC=" Makefile > /dev/null; then
CC="" # clear it just in case
else
! if [ "x$CC" = "x" ]; then CC=$COMPILER; fi
! echo "Setting C compiler to $CC"
fi
#
--- 295,331 ----
# Now that _that's_ done, get on with it
#
! echo " + configured for $OS platform"
#
! # Now we determine the C-compiler and optimization level
! # to use. Settings of CC and OPTIM in Configuration have
! # the highest precedence; next comes any settings from
! # the above "OS-specific" section. If still unset,
! # then we look for some popular compilers in our $PATH
! # and set a "safe" optimization level
! #
! for compilers in "gcc" "cc" "acc" "c89"
! do
! lookedfor="$lookedfor $compilers"
! if COMPILER=`./helpers/GuessWhere $compilers`; then
! break
fi
! done
if grep "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
#
***************
*** 324,330 ****
if grep "OPTIM=" Makefile > /dev/null; then
OPTIM="" # ditto
else
! if [ "x$OPTIM" = "x" ]; then OPTIM="-O2"; fi
fi
#
--- 334,343 ----
if grep "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
#
***************
*** 401,403 ****
--- 414,417 ----
echo >> Makefile
cat Makefile.tmpl >> Makefile
+
1.9 +11 -5 apache/src/INSTALL
Index: INSTALL
===================================================================
RCS file: /export/home/cvs/apache/src/INSTALL,v
retrieving revision 1.8
retrieving revision 1.9
diff -C3 -r1.8 -r1.9
*** INSTALL 1996/10/22 00:03:07 1.8
--- INSTALL 1996/10/24 21:17:34 1.9
***************
*** 1,4 ****
! $Id: INSTALL,v 1.8 1996/10/22 00:03:07 jim Exp $
This release of Apache supports the notion of "optional modules".
However, the server has to know which modules are compiled into it, in
--- 1,4 ----
! $Id: INSTALL,v 1.9 1996/10/24 21:17:34 jim Exp $
This release of Apache supports the notion of "optional modules".
However, the server has to know which modules are compiled into it, in
***************
*** 30,37 ****
% Configure
Using 'Configuration' as config file
! Configured for <whatever> platform
! Setting C compiler to <whatever>
%
This generates new versions of the Makefile and of modules.c. (If
--- 30,38 ----
% Configure
Using 'Configuration' as config file
! + configured for <whatever> platform
! + setting C compiler to <whatever> *
! + setting C compiler optimization-level to <whatever> *
%
This generates new versions of the Makefile and of modules.c. (If
***************
*** 39,48 ****
% Configure -file Configuration.ai
Using alternate config file Configuration.ai
! Configured for <whatever> platform
! Setting C compiler to <whatever>
%
3) Type "make".
The modules we place in the Apache distribution are the ones we have
--- 40,53 ----
% Configure -file Configuration.ai
Using alternate config file Configuration.ai
! + configured for <whatever> platform
! + setting C compiler to <whatever> *
! + setting C compiler optimization-level to <whatever> *
%
+ (*: Depending on Configuration and your system, Configure
+ make not print these lines. That's OK)
+
3) Type "make".
The modules we place in the Apache distribution are the ones we have
***************
*** 55,57 ****
--- 60,63 ----
+
