httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0 CHANGES configure.in
Date Thu, 03 Apr 2003 11:52:09 GMT
trawick     2003/04/03 03:52:09

  Modified:    .        CHANGES configure.in
  Log:
  Fix a build problem with passing unsupported --enable-layout
  args to apr and apr-util.  This broke binbuild.sh as well as
  user-specified layout parameters.
  
  PR:                                  18649
  Original concept code submitted by:  Justin Erenkrantz
  Mangled by:                          Jeff Trawick
  
  Revision  Changes    Path
  1.1134    +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1133
  retrieving revision 1.1134
  diff -u -r1.1133 -r1.1134
  --- CHANGES	2 Apr 2003 04:12:28 -0000	1.1133
  +++ CHANGES	3 Apr 2003 11:52:07 -0000	1.1134
  @@ -2,6 +2,11 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Fix a build problem with passing unsupported --enable-layout
  +     args to apr and apr-util.  This broke binbuild.sh as well as
  +     user-specified layout parameters.  PR 18649 [Justin Erenkrantz,
  +     Jeff Trawick]
  +
     *) ap_get_mime_headers_core: allocate space for the trailing null
        when folding is in effect.
        PR 18170 [Peter Mayne <PeterMayne@SPAM_SUX.ap.spherion.com>]
  
  
  
  1.247     +21 -0     httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.246
  retrieving revision 1.247
  diff -u -r1.246 -r1.247
  --- configure.in	8 Mar 2003 13:54:41 -0000	1.246
  +++ configure.in	3 Apr 2003 11:52:08 -0000	1.247
  @@ -59,6 +59,21 @@
   
   orig_prefix="$prefix"
   
  +dnl apr and apr-util don't handle Apache layouts, so build a version
  +dnl of the configure args without the --enable-layout= arg
  +
  +no_layout_configure_args=
  +ap_sep=
  +for ac_configure_arg in $ac_configure_args
  +do
  +  case "$ac_configure_arg" in
  +    --enable-layout=*)
  +      continue ;;
  +  esac
  +  no_layout_configure_args="$no_layout_configure_args$ap_sep'$ac_configure_arg'"
  +  ap_sep=" "
  +done
  +
   echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
   
   APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1)
  @@ -68,7 +83,10 @@
   fi
   
   if test "$apr_found" = "reconfig"; then
  +  orig_ac_configure_args=$ac_configure_args
  +  ac_configure_args=$no_layout_configure_args
     APR_SUBDIR_CONFIG(srclib/apr, [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix
--libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir])
  +  ac_configure_args=$orig_ac_configure_args
     dnl We must be the first to build and the last to be cleaned
     AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
     AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS apr"
  @@ -91,7 +109,10 @@
   fi
   
   if test "$apu_found" = "reconfig"; then
  +  orig_ac_configure_args=$ac_configure_args
  +  ac_configure_args=$no_layout_configure_args
     APR_SUBDIR_CONFIG(srclib/apr-util, [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix
--libdir=$libdir --includedir=$includedir --bindir=$bindir])
  +  ac_configure_args=$orig_ac_configure_args
     dnl We must be the last to build and the first to be cleaned
     AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
     AP_CLEAN_SRCLIB_DIRS="apr-util $AP_CLEAN_SRCLIB_DIRS"
  
  
  

Mime
View raw message