httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@hyperreal.org
Subject cvs commit: apache-1.3/src Configure
Date Wed, 18 Mar 1998 20:50:41 GMT
jim         98/03/18 12:50:40

  Modified:    src      Configure
  Log:
  Submitted by:	Jim Jagielski
  BUG: Configure wasn't using CC consistantly... We set CC to whatever
       it eventually is set to in Makefile
  
  Revision  Changes    Path
  1.213     +20 -12    apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.212
  retrieving revision 1.213
  diff -u -r1.212 -r1.213
  --- Configure	1998/03/17 16:08:44	1.212
  +++ Configure	1998/03/18 20:50:39	1.213
  @@ -661,12 +661,15 @@
   ## then we look for a known compiler somewhere in PATH
   ##
   
  -# First, look for a CC=<whatever> setting in Configure (recall, we
  +# First, look for a CC=<whatever> setting in Configuration (recall, we
   # copied these to Makefile.config)
  +#
  +# If $TCC is null, then no such line exists in Configuration
  +#
   TCC=`egrep '^CC=' Makefile.config | tail -1 | awk -F= '{print $2}'`
   if [ "x$TCC" = "x" ]; then
       if [ "x$CC" = "x" ]; then
  -        # At this point, CC is not set in Configure or above, so we
  +        # At this point, CC is not set in Configuration or above, so we
           # try to find one
   	for compilers in "gcc" "cc" "acc" "c89"
   	do
  @@ -689,18 +692,23 @@
   fi
   
   ####################################################################
  -## Look for OPTIM and save for later
  -##
  -TOPTIM=`egrep '^OPTIM=' Makefile.config | tail -1 | awk -F= '{print $2}'`
  -
  -####################################################################
  -## Set the value of CC if need be
  +## Write the value of $CC to Makefile.config... We only do this
  +## is not done already (ie: a 'CC=' line was in Configuration).
  +## If there was an entry for it, then set $CC for our own internal
  +## use.
   ##
   if [ "x$TCC" = "x" ]; then
       echo "CC=$CC" >> Makefile.config
  +else
  +    CC=$TCC
   fi
   
   ####################################################################
  +## Look for OPTIM and save for later
  +##
  +TOPTIM=`egrep '^OPTIM=' Makefile.config | tail -1 | awk -F= '{print $2}'`
  +
  +####################################################################
   ## Check for user provided flags for shared object support
   ##
   TLDFLAGS_SHLIB=`egrep '^LDFLAGS_SHLIB=' Makefile.config | tail -1 | awk -F= '{print $2}'`
  @@ -823,24 +831,24 @@
   ##
   case "$OS" in
       'ULTRIX')
  -	if [ "$TCC" = "cc" ]; then
  +	if [ "$CC" = "cc" ]; then
   	    CFLAGS="$CFLAGS -std"
   	fi
   	;;
       'SCO 5')
  -	if [ "$TCC" = "cc" ]; then
  +	if [ "$CC" = "cc" ]; then
   	    OSBPRINTF="-K noinline"
   	fi
   	;;
       'HI-UX')
  -	if [ "$TCC" = "cc" ]; then
  +	if [ "$CC" = "cc" ]; then
   	    CFLAGS="$CFLAGS -Aa -D_HIUX_SOURCE"
   	    OPTIM=" "
   	    TOPTIM=""
   	fi
   	;;
       'HP-UX'|'HP-UX 10')
  -	if [ "$TCC" = "cc" ]; then
  +	if [ "$CC" = "cc" ]; then
   	    CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
   	    OPTIM=" "
   	    TOPTIM=""
  
  
  

Mime
View raw message