jim 97/05/10 10:14:38
Modified: src Configuration.tmpl Configure
Log:
Fix problem with HP-UX cc compiler
Revision Changes Path
1.63 +1 -1 apache/src/Configuration.tmpl
Index: Configuration.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
retrieving revision 1.62
retrieving revision 1.63
diff -C3 -r1.62 -r1.63
*** Configuration.tmpl 1997/04/27 09:58:32 1.62
--- Configuration.tmpl 1997/05/10 17:14:36 1.63
***************
*** 47,53 ****
EXTRA_INCLUDES=
#CC=
! OPTIM=-O2
#RANLIB=
################################################################
--- 47,53 ----
EXTRA_INCLUDES=
#CC=
! #OPTIM=-O2
#RANLIB=
################################################################
1.94 +26 -16 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.93
retrieving revision 1.94
diff -C3 -r1.93 -r1.94
*** Configure 1997/04/27 07:52:16 1.93
--- Configure 1997/05/10 17:14:36 1.94
***************
*** 46,53 ****
# 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...
--- 46,55 ----
# First, strip comments and blank lines and then change Rules to comments
! sed 's/#.*//' $file | \
! sed '/^[ ]*$/d' | \
! sed 's/[ ]*$//' | \
! sed 's/^Rule[ ]*/##Rule:/' | \
# Check for syntax errors...
***************
*** 165,170 ****
--- 167,186 ----
fi
#
+ # 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"
+ do
+ lookedfor="$lookedfor $compilers"
+ if ./helpers/PrintPath -s $compilers; then
+ COMPILER="$compilers"
+ break
+ fi
+ done
+
+ #
SHELL="/bin/sh"
case "$PLAT" in
***************
*** 210,232 ****
OS='HI-UX'
CFLAGS="$CFLAGS -DHIUX"
# if we're using the HIUX compiler, add a few flags.
! if [ "$CC" = "cc" ]; then
CFLAGS="$CFLAGS -Aa -D_HIUX_SOURCE"
fi
;;
*-hp-hpux10.*)
OS='HP-UX 10'
CFLAGS="$CFLAGS -DHPUX10"
# if we're using the HPUX compiler, add a few flags.
! if [ "$CC" = "cc" ]; then
CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
fi
;;
*-hp-hpux*)
OS='HP-UX'
CFLAGS="$CFLAGS -DHPUX"
! if [ "$CC" = "cc" ]; then
CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
fi
;;
*-sgi-irix64)
--- 226,251 ----
OS='HI-UX'
CFLAGS="$CFLAGS -DHIUX"
# if we're using the HIUX compiler, add a few flags.
! if [ "$CC" = "cc" ] || [ "$COMPILER" = "cc" ]; then
CFLAGS="$CFLAGS -Aa -D_HIUX_SOURCE"
+ OPTIM=" "
fi
;;
*-hp-hpux10.*)
OS='HP-UX 10'
CFLAGS="$CFLAGS -DHPUX10"
# if we're using the HPUX compiler, add a few flags.
! if [ "$CC" = "cc" ] || [ "$COMPILER" = "cc" ]; then
CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
+ OPTIM=" "
fi
;;
*-hp-hpux*)
OS='HP-UX'
CFLAGS="$CFLAGS -DHPUX"
! if [ "$CC" = "cc" ] || [ "$COMPILER" = "cc" ]; then
CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
+ OPTIM=" "
fi
;;
*-sgi-irix64)
***************
*** 321,327 ****
;;
*-isc4*)
OS='ISC 4'
! CC=gcc
CFLAGS="$CFLAGS -posix -DISC"
LFLAGS="$LFLAGS -posix"
LIBS="$LIBS -linet"
--- 340,346 ----
;;
*-isc4*)
OS='ISC 4'
! CC='gcc'
CFLAGS="$CFLAGS -posix -DISC"
LFLAGS="$LFLAGS -posix"
LIBS="$LIBS -linet"
***************
*** 470,487 ****
# 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 ./helpers/PrintPath -s $compilers; then
- COMPILER="$compilers"
- break
- fi
- done
if grep "CC=" Makefile > /dev/null; then
CC="" # clear it just in case
--- 489,497 ----
# 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 use the "found" location of COMPILERS above
# and set a "safe" optimization level
#
if grep "CC=" Makefile > /dev/null; then
CC="" # clear it just in case
