httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3/src CHANGES Configure
Date Sun, 06 Dec 1998 15:22:38 GMT
rse         98/12/06 07:22:37

  Modified:    src      CHANGES Configure
  Log:
  In src/Configure remove the SERVER_SUBVERSION support (already deprecated
  since 1.3b7) and make whitespace handling more robust (it failed horrible
  when whitespaces were present in the arguments of -D options).
  
  PR: 3240
  
  Revision  Changes    Path
  1.1163    +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1162
  retrieving revision 1.1163
  diff -u -r1.1162 -r1.1163
  --- CHANGES	1998/12/05 11:13:41	1.1162
  +++ CHANGES	1998/12/06 15:22:33	1.1163
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.4
   
  +  *) In src/Configure remove the SERVER_SUBVERSION support (already deprecated
  +     since 1.3b7) and make whitespace handling more robust (it failed horrible
  +     when whitespaces were present in the arguments of -D options).
  +     [Ralf S. Engelschall] PR#3240
  +
     *) Add APACI --shadow=DIR variant (in addition to --shadow). This now first
        creates an external package shadow tree in DIR before the local build
        shadow tree is generated under DIR. This way one can have the extracted
  
  
  
  1.309     +21 -16    apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.308
  retrieving revision 1.309
  diff -u -r1.308 -r1.309
  --- Configure	1998/12/02 14:03:30	1.308
  +++ Configure	1998/12/06 15:22:36	1.309
  @@ -1716,14 +1716,6 @@
   echo "" >> Makefile
   
   ####################################################################
  -## Now add -DSERVER_SUBVERSION if $SUBVERSION is set
  -##
  -if [ "x$SUBVERSION" != "x" ] ; then
  -        SUBVERSION=`echo $SUBVERSION | sed 's/^ +//'`
  -	CFLAGS="$CFLAGS -DSERVER_SUBVERSION=\\\"$SUBVERSION\\\""
  -fi
  -
  -####################################################################
   ## Determine GNU Make variant because
   ## it uses ugly looking built-in directory walk messages
   ## while we are already using our own messages
  @@ -1793,16 +1785,29 @@
   ## ap_config_auto.h so they are available to external modules needing to
   ## include Apache header files.
   ##
  -for cflag in $CFLAGS; do
  -	echo $cflag | sed 's/\\\"/\"/g' >>$tmpconfig ;
  +TEXTRA_CFLAGS=`egrep '^EXTRA_CFLAGS=' Makefile.config | tail -1 |\
  +               sed -e 's;^EXTRA_CFLAGS=;;' -e 's;\`.*\`;;'`
  +tmpstr=`echo $CFLAGS $TEXTRA_CFLAGS |\
  +        sed -e 's;[ 	]-;!-;g' -e 's/\\\"/\"/g' -e 's/\([^\\]\)"/\1/g'`
  +OIFS="$IFS" IFS='!'
  +for cflag in $tmpstr; do
  +    echo "$cflag" >>$tmpconfig
   done
  +IFS="$OIFS"
   awk >>$AP_CONFIG_AUTO_H <$tmpconfig '
  -	/^-D.*/ {
  -		define = substr($1, 3, length($1)-2)
  -		split(define, parts, "=")
  -		printf ("\n/* build flag: %s */\n", $0)
  -		printf ("#ifndef %s\n#define %s %s\n#endif\n", parts[1],parts[1],parts[2])
  -	}
  +    /^-D.*/ {
  +        i = index($0, "=")
  +        if (i > 0) {
  +            define = substr($0, 3, i-3)
  +            value  = substr($0, i+1, length($0)-i)
  +        }
  +        else {
  +            define = substr($0, 3, length($0)-2)
  +            value  = "1";
  +        }
  +        printf ("\n/* build flag: %s */\n", $0)
  +        printf ("#ifndef %s\n#define %s %s\n#endif\n", define, define, value)
  +    }
   '
   
   # finish header file
  
  
  

Mime
View raw message