httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.org>
Subject cvs commit: apache/src/helpers TestCompile
Date Mon, 04 Aug 1997 23:46:02 GMT
jim         97/08/04 16:46:01

  Modified:    src       Configuration.tmpl Configure
               src/helpers  TestCompile
  Log:
  Configuration suite changes:
    (1) No longer default OPTIM to -O2 (or anything)
    (2) When doing the sanity check, have TestCompile display error
        messages. Add -v and -s flags to make TestCompile always/never
        display stderr
  
  Revision  Changes    Path
  1.69      +1 -1      apache/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- Configuration.tmpl	1997/07/31 20:56:24	1.68
  +++ Configuration.tmpl	1997/08/04 23:45:58	1.69
  @@ -39,7 +39,7 @@
   #
   # You can also set the compiler and Optimization used here as well.
   # Settings here have priority; If not set, Configure will attempt to guess
  -# the C compiler, and set OPTIM to '-O2'
  +# the C compiler, looking for gcc first, then cc.
   #
   EXTRA_CFLAGS=
   EXTRA_LDFLAGS=
  
  
  
  1.125     +9 -12     apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.124
  retrieving revision 1.125
  diff -u -r1.124 -r1.125
  --- Configure	1997/08/01 10:24:41	1.124
  +++ Configure	1997/08/04 23:45:59	1.125
  @@ -554,7 +554,6 @@
   # the highest precedence; next comes any settings from
   # the above "OS-specific" section. If still unset,
   # then we look for a known compiler somewhere in PATH
  -# and set a "safe" optimization level
   #
   #
   # First, look for a CC=<whatever> setting in Configure (recall, we
  @@ -585,19 +584,14 @@
       fi
       echo " + setting C compiler to $CC"
   fi
  +
   #
  -# Ditto for optimization
  +# Look for OPTIM and save for later
   #
   TOPTIM=`egrep '^OPTIM=' Makefile.config | tail -1 | awk -F= '{print $2}'`
  -if [ "x$TOPTIM" = "x" ]; then
  -    if [ "x$OPTIM" = "x" ]; then
  -	OPTIM="-O2"
  -    fi
  -    echo " + setting C compiler optimization-level to $OPTIM"
  -fi
   
   ####################################################################
  -# Set the value of CC if need be; don't worry about OPTIM yet
  +# Set the value of CC if need be
   #
   if [ "x$TCC" = "x" ]; then
       echo "CC=$CC" >> Makefile.config
  @@ -703,15 +697,18 @@
   echo "SHELL=$SHELL">> Makefile.config
   
   ####################################################################
  -# Use TestCompile to see if $(CC) is ANSI
  +# Use TestCompile to see if $(CC) is ANSI and as a "final" sanity
  +# check
   #
  +echo " + doing sanity check on compiler and options"
   if ./helpers/TestCompile ansi; then
       :
   else
      echo "** A test compilation with your Makefile configuration"
  -   echo "** failed. This is mostly like since your C compiler"
  +   echo "** failed. This is most likely because your C compiler"
      echo "** is not ANSI. Apache requires an ANSI C Compiler, such"
  -   echo "** as gcc."
  +   echo "** as gcc. The above error message from your compiler"
  +   echo "** will also provide a clue."
      echo " Aborting!"
      exit 1
   fi
  
  
  
  1.3       +25 -1     apache/src/helpers/TestCompile
  
  Index: TestCompile
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/TestCompile,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestCompile	1997/07/25 02:12:59	1.2
  +++ TestCompile	1997/08/04 23:46:00	1.3
  @@ -24,6 +24,20 @@
   #
   
   #
  +# Handle "verbose" and "silent" flags
  +#
  +case "$1" in
  +    "-v")
  +        VERBOSE="yes"
  +	shift
  +	;;
  +    "-s")
  +        VERBOSE="no"
  +	shift
  +	;;
  +esac
  +
  +#
   # Make sure have the right arguments
   #
   
  @@ -33,9 +47,19 @@
   	    exit
   	fi
   	TLIB="-l$2"
  +	if [ "$VERBOSE" = "yes" ]; then
  +	    ERRDIR=""
  +	else
  +	    ERRDIR='2>/dev/null'
  +	fi
   	;;
       "ansi")
   	TLIB=""
  +	if [ "$VERBOSE" = "no" ]; then
  +	    ERRDIR='2>/dev/null'
  +	else
  +	    ERRDIR=""
  +	fi
   	;;
       *)
       	exit
  @@ -60,7 +84,7 @@
   EOF
   
   # Now run that Makefile
  -make dummy >/dev/null 2>&1
  +eval "make dummy >/dev/null $ERRDIR"
   
   # And see if dummy exists, if so, then we assume the 
   # condition we are testing for is good
  
  
  

Mime
View raw message