httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rodent of Unusual Size <c...@hyperreal.org>
Subject cvs commit: apachen/src CHANGES Configure
Date Wed, 03 Sep 1997 15:56:14 GMT
coar        97/09/03 08:56:13

  Modified:    src      CHANGES Configure
  Log:
  	Fix a problem caused by a continuation mark being put on the
  	last line of a multi-line statement.  Also, force Paul to
  	take credit for his excellent changes to the Configure process.
  
  Revision  Changes    Path
  1.427     +4 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.426
  retrieving revision 1.427
  diff -u -r1.426 -r1.427
  --- CHANGES	1997/09/02 16:19:14	1.426
  +++ CHANGES	1997/09/03 15:56:07	1.427
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3a2
   
  +  *) Modules and core routines are now put into libraries, which
  +     simplifies the link line tremendously (among other advantages).
  +     [Paul Sutton]
  +
     *) Some of the MD5 names defined in Apache have been renamed to have
        an `ap_' prefix to avoid conflicts with routines supplied by
        external libraries.  [Ken Coar]
  
  
  
  1.146     +19 -8     apachen/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.145
  retrieving revision 1.146
  diff -u -r1.145 -r1.146
  --- Configure	1997/09/03 08:30:04	1.145
  +++ Configure	1997/09/03 15:56:08	1.146
  @@ -854,27 +854,38 @@
   	fi
   done
   
  -# Add the module targets to the Makefile. Do not add inidividual object
  +# Add the module targets to the Makefile. Do not add individual object
   # targets for auto-generated directories.
   awk -v AUTODIRS="$AUTODIRS" >>Makefile <$tmpfile '\
      BEGIN { split ( AUTODIRS, tmp, / /); \
   		for ( key in tmp ) { autodirs[tmp[key]] = 1; } } \
      /^Module/ { modules[n++] = $3 } \
      /^%Module/ { modules[n++] = $3 } \
  -   END { print "MODULES=\\";  \
  +   END { print "MODULES= \\";  \
   	 for (i = 0; i < n; ++i) { \
   	     split ( modules[i], pp, /\//); \
   	     dir = pp[1] "/" pp[2] ; \
   	     if ( dir in autodirs ) { continue; }\
  -	     else printf ("  %s\\\n", modules[i]); \
  +	     else printf ("  %s \\\n", modules[i]); \
   	 } \
          }'
   
  -# Now add the auto-generated library targets
  -for lib in $AUTOLIBS; do
  -	echo "  $lib \\" >> Makefile
  -done
  -echo >> Makefile
  +# Now add the auto-generated library targets.  Need to use awk so we
  +# don't hang a continuation on the last line.
  +
  +awk -v AUTOLIBS="$AUTOLIBS" >>Makefile </dev/null '\
  +    BEGIN { \
  +	split ( AUTOLIBS, libs ); \
  +	z = 0; \
  +	for ( lib in libs ) { \
  +	    if (z != 0) { printf (" \\\n") } \
  +	    z++; \
  +	    printf ("  %s", libs[lib]); \
  +	} \
  +    } \
  +    END { \
  +	printf ("\n"); \
  +    }'
   
   ####################################################################
   # Continue building Makefile.config.
  
  
  

Mime
View raw message