Commit 8c1c90d1 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

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 <itojun@iijlab.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88647 13f79535-47bb-0310-9956-ffa450edef68
parent 482e78ad

CHANGES

+5 −0
Original line number Diff line number Diff line 
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 <itojun@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

acinclude.m4

+3 −3
Original line number Diff line number Diff line
@@ -291,11 +291,11 @@ dnl 
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 @@ if test -z "$LAYOUT"; then 
  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)