apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr/build apr_common.m4
Date Mon, 17 Feb 2003 02:36:22 GMT
jerenkrantz    2003/02/16 18:36:22

  Modified:    .        CHANGES
               build    apr_common.m4
  Log:
  Fix APR_LAYOUT to work with layout files with no preceding blank lines
  and emit errors when layout is not found.
  
  Also, add a third parameter that allows httpd to pass in the extra variables
  that it expects its config.layout to have.
  
  PR: 15679
  
  Revision  Changes    Path
  1.378     +4 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.377
  retrieving revision 1.378
  diff -u -u -r1.377 -r1.378
  --- CHANGES	12 Feb 2003 20:20:56 -0000	1.377
  +++ CHANGES	17 Feb 2003 02:36:21 -0000	1.378
  @@ -1,5 +1,9 @@
   Changes with APR 0.9.2
   
  +  *) Fix APR_LAYOUT to work with layout files with no preceding blank lines
  +     and emit errors when layout is not found.  PR 15679.
  +     [Justin Erenkrantz]
  +
     *) Add functions apr_filepath_list_split and apr_filepath_list_merge
        for managing search paths.  [Branko Cibej]
   
  
  
  
  1.52      +11 -7     apr/build/apr_common.m4
  
  Index: apr_common.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_common.m4,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -u -r1.51 -r1.52
  --- apr_common.m4	15 Feb 2003 18:09:30 -0000	1.51
  +++ apr_common.m4	17 Feb 2003 02:36:21 -0000	1.52
  @@ -713,7 +713,7 @@
   AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[
 ][$1] substr([                       ],len($1))[$2])])
   
   dnl
  -dnl APR_LAYOUT(configlayout, layoutname)
  +dnl APR_LAYOUT(configlayout, layoutname [, extravars])
   dnl
   AC_DEFUN(APR_LAYOUT,[
     if test ! -f $srcdir/config.layout; then
  @@ -723,19 +723,23 @@
     fi
     pldconf=./config.pld
     changequote({,})
  -  sed -e "1,/[ 	]*<[lL]ayout[ 	]*$2[ 	]*>[ 	]*/d" \
  +  sed -e "1s/[ 	]*<[lL]ayout[ 	]*$2[ 	]*>[ 	]*//;t" \
  +      -e "1,/[ 	]*<[lL]ayout[ 	]*$2[ 	]*>[ 	]*/d" \
         -e '/[ 	]*<\/Layout>[ 	]*/,$d' \
         -e "s/^[ 	]*//g" \
         -e "s/:[ 	]*/=\'/g" \
         -e "s/[ 	]*$/'/g" \
         $1 > $pldconf
     layout_name=$2
  +  if test ! -s $pldconf; then
  +    echo "** Error: unable to find layout $layout_name"
  +    exit 1
  +  fi
     . $pldconf
     rm $pldconf
     for var in prefix exec_prefix bindir sbindir libexecdir mandir \
  -             sysconfdir datadir  \
  -             includedir localstatedir runtimedir logfiledir libdir \
  -             installbuilddir libsuffix; do
  +             sysconfdir datadir includedir localstatedir runtimedir \
  +             logfiledir libdir installbuilddir libsuffix $3; do
       eval "val=\"\$$var\""
       case $val in
         *+)
  @@ -765,7 +769,7 @@
   ])dnl
   
   dnl
  -dnl APR_ENABLE_LAYOUT(default layout name)
  +dnl APR_ENABLE_LAYOUT(default layout name [, extra vars])
   dnl
   AC_DEFUN(APR_ENABLE_LAYOUT,[
   AC_ARG_ENABLE(layout,
  @@ -776,7 +780,7 @@
   if test -z "$LAYOUT"; then
     LAYOUT="$1"
   fi
  -APR_LAYOUT($srcdir/config.layout, $LAYOUT)
  +APR_LAYOUT($srcdir/config.layout, $LAYOUT, $2)
   
   AC_MSG_CHECKING(for chosen layout)
   AC_MSG_RESULT($layout_name)
  
  
  

Mime
View raw message