cvs commit: httpd-2.0 CHANGES acinclude.m4

[rb...@apache.org]

rbb         01/04/02 09:15:35

  Modified:    .        CHANGES acinclude.m4
  Log:
  Fix --enable-layout processing on NetBSD.  This makes us use a consistant
  location for the config.layout file, and it makes us a bit more portable.
  PR:     7482
  Submitted by:   jun-ichiro hagino <it...@iijlab.net>
  
  Revision  Changes    Path
  1.154     +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.153
  retrieving revision 1.154
  diff -u -d -b -w -u -r1.153 -r1.154
  --- CHANGES	2001/04/02 06:19:44	1.153
  +++ CHANGES	2001/04/02 16:15:30	1.154
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.16-dev
   
  +  *) Cleanup the --enable-layout option of configure.  This makes
  +     us use a consistent location for the config.layout file, and it
  +     makes configure more portable.
  +     [jun-ichiro hagino <it...@iijlab.net>]
  +
     *) Changes to 'ab'; fixed int overrun's, added statistics, output in
        csv/gnuplot format, rudimentary ssl support and various other tweaks
        to make results more true to what is measured. The upshot of this it
  
  
  
  1.72      +3 -3      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -d -b -w -u -r1.71 -r1.72
  --- acinclude.m4	2001/04/02 15:20:45	1.71
  +++ acinclude.m4	2001/04/02 16:15:31	1.72
  @@ -291,11 +291,11 @@
   dnl APACHE_LAYOUT(configlayout, layoutname)
   AC_DEFUN(APACHE_LAYOUT,[
     if test ! -f $srcdir/config.layout; then
  -    echo "** Error: Layout file $srcdir/../config.layout not found"
  +    echo "** Error: Layout file $srcdir/config.layout not found"
       echo "** Error: Cannot use undefined layout '$LAYOUT'"
       exit 1
     fi
  -  pldconf=config.pld
  +  pldconf=./config.pld
     changequote({,})
     sed -e "1,/[ 	]*<[lL]ayout[ 	]*$2[ 	]*>[ 	]*/d" \
         -e '/[ 	]*<\/Layout>[ 	]*/,$d' \
  @@ -354,7 +354,7 @@
     libexecdir='${prefix}/modules'
     layout_name=Apache
   else  
  -  APACHE_LAYOUT($srcdir/../config.layout, $LAYOUT)
  +  APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
   fi
   
   AC_MSG_CHECKING(for chosen layout)