httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@jaguNET.com>
Subject [PATCH] HP-UX/cc compiler fix
Date Sat, 10 May 1997 12:49:30 GMT
Index: apache/src/Configuration.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
retrieving revision 1.62
diff -c -r1.62 Configuration.tmpl
*** Configuration.tmpl	1997/04/27 09:58:32	1.62
--- Configuration.tmpl	1997/05/10 12:47:56
***************
*** 47,53 ****
  EXTRA_INCLUDES=
  
  #CC=
! OPTIM=-O2
  #RANLIB=
  
  ################################################################
--- 47,53 ----
  EXTRA_INCLUDES=
  
  #CC=
! #OPTIM=-O2
  #RANLIB=
  
  ################################################################
Index: apache/src/Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.93
diff -c -r1.93 Configure
*** Configure	1997/04/27 07:52:16	1.93
--- Configure	1997/05/10 12:47:56
***************
*** 165,170 ****
--- 165,184 ----
  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)
--- 224,249 ----
  	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)
***************
*** 470,488 ****
  # 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
  else
--- 487,495 ----
  # 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
  else
-- 
====================================================================
      Jim Jagielski            |       jaguNET Access Services
     jim@jaguNET.com           |       http://www.jaguNET.com/
                  "Not the Craw... the CRAW!"

Mime
View raw message