jim 96/10/21 17:03:09
Modified: src Configuration.tmpl Configure INSTALL
Added: src GuessWhere
Log:
Log: Cleaned up some Configuration stuff. Added 'which' capability
Revision Changes Path
1.45 +2 -5 apache/src/Configuration.tmpl
Index: Configuration.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
retrieving revision 1.44
retrieving revision 1.45
diff -C3 -r1.44 -r1.45
*** Configuration.tmpl 1996/10/09 17:36:18 1.44
--- Configuration.tmpl 1996/10/22 00:03:06 1.45
***************
*** 1,4 ****
! # $Id: Configuration.tmpl,v 1.44 1996/10/09 17:36:18 chuck Exp $
# Config file for the Apache httpd.
# Configuration.tmpl is the template for Configuration. Configuration should
--- 1,4 ----
! # $Id: Configuration.tmpl,v 1.45 1996/10/22 00:03:06 jim Exp $
# Config file for the Apache httpd.
# Configuration.tmpl is the template for Configuration. Configuration should
***************
*** 44,53 ****
#CC=
OPTIM=-O2
!
! #
! # Set to 'true' for systems that lack or don't need ranlib.
! RANLIB=ranlib
################################################################
# Rules configuration
--- 44,50 ----
#CC=
OPTIM=-O2
! #RANLIB=
################################################################
# Rules configuration
1.28 +11 -2 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.27
retrieving revision 1.28
diff -C3 -r1.27 -r1.28
*** Configure 1996/10/10 02:24:37 1.27
--- Configure 1996/10/22 00:03:06 1.28
***************
*** 1,5 ****
#!/bin/sh
! # $Id: Configure,v 1.27 1996/10/10 02:24:37 chuck Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
--- 1,5 ----
#!/bin/sh
! # $Id: Configure,v 1.28 1996/10/22 00:03:06 jim Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
***************
*** 314,320 ****
# set above. If so, then we honor that; if not, then we set some
# defaults (gcc and -O2)
#
! COMPILER=`./GuessCC`
if grep "CC=" Makefile > /dev/null; then
CC="" # clear it just in case
--- 314,323 ----
# set above. If so, then we honor that; if not, then we set some
# defaults (gcc and -O2)
#
! COMPILER=`./GuessWhere gcc`
! if [ "$COMPILER" = "not found" ]; then
! COMPILER=`./GuessWhere cc`
! fi
if grep "CC=" Makefile > /dev/null; then
CC="" # clear it just in case
***************
*** 385,390 ****
--- 388,398 ----
fi
fi
#
+ # Look for ranlib
+ #
+ RANLIB=`./GuessWhere ranlib`
+
+ #
# Good enough
#
echo >> Makefile
***************
*** 400,405 ****
--- 408,414 ----
echo "LFLAGS1=$LFLAGS">> Makefile
echo "BROKEN_BPRINTF_FLAGS=$OSBPRINTF">> Makefile
echo "REGLIB=$REGLIB">> Makefile
+ echo "RANLIB=$RANLIB">> Makefile
echo >> Makefile
echo "#### End of Configure created section ####">> Makefile
echo >> Makefile
1.8 +3 -1 apache/src/INSTALL
Index: INSTALL
===================================================================
RCS file: /export/home/cvs/apache/src/INSTALL,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** INSTALL 1996/09/13 21:02:17 1.7
--- INSTALL 1996/10/22 00:03:07 1.8
***************
*** 1,4 ****
! $Id: INSTALL,v 1.7 1996/09/13 21:02:17 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.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
***************
*** 31,36 ****
--- 31,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
***************
*** 39,44 ****
--- 40,46 ----
% Configure -file Configuration.ai
Using alternate config file Configuration.ai
Configured for <whatever> platform
+ Setting C compiler to <whatever>
%
3) Type "make".
