httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@jaguNET.com>
Subject [PATCH] Configure fixes for HP-UX and Module whitespace
Date Tue, 06 May 1997 20:52:49 GMT
Ok... Here's the full deal. This patch fixes the noted HP-UX/cc
problem but also that long-standing, always reported problem when
people have some whitespace before their 'Module' listing in
Configuration (usually because they just delete the '#' sign).

Comments?

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/06 20:49:31
***************
*** 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/06 20:49:31
***************
*** 45,53 ****
  fi
  
  # 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...
  
--- 45,55 ----
  fi
  
  # First, strip comments and blank lines and then change Rules to comments
+ # and then remove whitespace before Module declarations
  
  sed 's/#.*//' $file | sed '/^[ 	]*$/d' | sed 's/[ 	]*$//' | \
!  sed 's/^Rule[ 	]*/##Rule:/' | sed 's/^[ 	]*Module/Module/' \
!  > $tmpfile
  
  # Check for syntax errors...
  
***************
*** 165,170 ****
--- 167,184 ----
  fi
  
  #
+ # Also look for the standard compilers
+ #
+ 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)
***************
*** 321,327 ****
  	;;
      *-isc4*)
  	OS='ISC 4'
! 	CC=gcc
  	CFLAGS="$CFLAGS -posix -DISC"
  	LFLAGS="$LFLAGS -posix"
  	LIBS="$LIBS -linet"
--- 338,344 ----
  	;;
      *-isc4*)
  	OS='ISC 4'
! 	CC='gcc'
  	CFLAGS="$CFLAGS -posix -DISC"
  	LFLAGS="$LFLAGS -posix"
  	LIBS="$LIBS -linet"
***************
*** 474,489 ****
  # 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
      if [ "x$CC" = "x" ]; then
--- 491,497 ----
  # 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
***************
*** 501,507 ****
  #
  # Ditto for optimization
  #
! if  grep "OPTIM=" Makefile > /dev/null; then
      OPTIM=""	# ditto
  else
      if [ "x$OPTIM" = "x" ]; then
--- 509,515 ----
  #
  # Ditto for optimization
  #
! if  egrep "^OPTIM[ 	]*=" Makefile > /dev/null; then
      OPTIM=""	# ditto
  else
      if [ "x$OPTIM" = "x" ]; then
-- 
====================================================================
      Jim Jagielski            |       jaguNET Access Services
     jim@jaguNET.com           |       http://www.jaguNET.com/
                  "Not the Craw... the CRAW!"

Mime
View raw message