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 configure.in STATUS CHANGES
Date Thu, 17 Apr 2003 02:57:23 GMT
trawick     2003/04/16 19:57:23

  Modified:    .        Tag: APACHE_2_0_BRANCH configure.in STATUS CHANGES
  Log:
  merge this fix into 2.0.46-dev:
  
    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]
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.232.2.6 +8 -3      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.232.2.5
  retrieving revision 1.232.2.6
  diff -u -r1.232.2.5 -r1.232.2.6
  --- configure.in	11 Mar 2003 12:35:46 -0000	1.232.2.5
  +++ configure.in	17 Apr 2003 02:57:21 -0000	1.232.2.6
  @@ -68,7 +68,9 @@
   fi
   
   if test "$apr_found" = "reconfig"; then
  -  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])
  +  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],
  +                    [--enable-layout=*|\'--enable-layout=*])
     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 +93,9 @@
   fi
   
   if test "$apu_found" = "reconfig"; then
  -  APR_SUBDIR_CONFIG(srclib/apr-util, [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix
--libdir=$libdir --includedir=$includedir --bindir=$bindir])
  +  APR_SUBDIR_CONFIG(srclib/apr-util,
  +                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir
--includedir=$includedir --bindir=$bindir],
  +                    [--enable-layout=*|\'--enable-layout=*])
     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"
  @@ -104,7 +108,8 @@
   
   echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
   
  -APR_SUBDIR_CONFIG(srclib/pcre, [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir
--includedir=$includedir --bindir=$bindir])
  +APR_SUBDIR_CONFIG(srclib/pcre,
  +                  [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir
--bindir=$bindir])
   
   echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
   
  
  
  
  1.751.2.217 +1 -7      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.216
  retrieving revision 1.751.2.217
  diff -u -r1.751.2.216 -r1.751.2.217
  --- STATUS	16 Apr 2003 17:28:29 -0000	1.751.2.216
  +++ STATUS	17 Apr 2003 02:57:21 -0000	1.751.2.217
  @@ -59,12 +59,6 @@
   
   RELEASE SHOWSTOPPERS:
   
  -    * --enable-layout breakage, a better fix for PR 18649
  -      configure.in r1.248
  -      apr/build/apr_common.m4 r1.55
  -      +1: jerenkrantz, trawick, thommay
  -      -1:
  -
   PATCHES TO PORT FROM 2.1
     [ please place file names and revisions from HEAD here, so it is easy to
       identify exactly what the proposed changes are! ]
  
  
  
  1.988.2.80 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.79
  retrieving revision 1.988.2.80
  diff -u -r1.988.2.79 -r1.988.2.80
  --- CHANGES	15 Apr 2003 17:41:33 -0000	1.988.2.79
  +++ CHANGES	17 Apr 2003 02:57:22 -0000	1.988.2.80
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.46
   
  +  *) 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]
  +
     *) If a Date response header was already set in the headers array,
        this value was ignored in favour of the current time. This meant
        that Date headers on proxied requests where rewritten when they
  
  
  

Mime
View raw message