Commit 8d0e9013 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

merge from trunk: 

    Allow htcacheclean, httxt2dbm, and fcgistarter to link apr/apr-util
    statically like the older support programs.

Submitted by: Eric Covener <covener gmail.com>
Reviewed by: trawick, wrowe, jerenkrantz



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@490027 13f79535-47bb-0310-9956-ffa450edef68
parent bf23a383

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.4









  *) Allow htcacheclean, httxt2dbm, and fcgistarter to link apr/apr-util









     statically like the older support programs.









     [Eric Covener <covener gmail.com>]

















  *) core: Fix NONBLOCK status of listening sockets on restart/graceful









     PR 37680.  [Darius Davis <darius-abz free-range.com.au>]










































STATUS



+0
−7



























Changes for STATUS: 0 added lines, 7 removed lines.



Original line number
Diff line number
Diff line







@@ -78,13 +78,6 @@ RELEASE SHOWSTOPPERS:







PATCHES ACCEPTED TO BACKPORT FROM TRUNK:









  [ start all new proposals below, under PATCHES PROPOSED. ]



















    * Allow htcacheclean and httxt2dbm to link apr/apr-util statically









      like the older support programs.









      Trunk version of patch:









        http://svn.apache.org/viewvc?view=rev&revision=441796









      2.2.x version of patch:









        http://mail-archives.apache.org/mod_mbox//httpd-dev/200609.mbox/%3c1404e5910609091218p84f4d2flc1000764b4966727@mail.gmail.com%3e









      +1: trawick, wrowe, jerenkrantz



















PATCHES PROPOSED TO BACKPORT FROM TRUNK:












































support/config.m4



+22
−0



























Changes for support/config.m4: 22 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -5,6 +5,8 @@ logresolve_LTFLAGS=""







htdbm_LTFLAGS=""









ab_LTFLAGS=""









checkgid_LTFLAGS=""









htcacheclean_LTFLAGS=""









httxt2dbm_LTFLAGS=""



















AC_ARG_ENABLE(static-support,APACHE_HELP_STRING(--enable-static-support,Build a statically linked version of the support binaries),[









if test "$enableval" = "yes" ; then










@@ -15,6 +17,8 @@ if test "$enableval" = "yes" ; then







  APR_ADDTO(htdbm_LTFLAGS, [-static])









  APR_ADDTO(ab_LTFLAGS, [-static])









  APR_ADDTO(checkgid_LTFLAGS, [-static])









  APR_ADDTO(htcacheclean_LTFLAGS, [-static])









  APR_ADDTO(httxt2dbm_LTFLAGS, [-static])









fi









])




















@@ -81,6 +85,24 @@ fi







])









APACHE_SUBST(checkgid_LTFLAGS)



















AC_ARG_ENABLE(static-htcacheclean,APACHE_HELP_STRING(--enable-static-htcacheclean,Build a statically linked version of htcacheclean),[









if test "$enableval" = "yes" ; then









  APR_ADDTO(htcacheclean_LTFLAGS, [-static])









else









  APR_REMOVEFROM(htcacheclean_LTFLAGS, [-static])









fi









])









APACHE_SUBST(htcacheclean_LTFLAGS)



















AC_ARG_ENABLE(static-httxt2dbm,APACHE_HELP_STRING(--enable-static-httxt2dbm,Build a statically linked version of httxt2dbm),[









if test "$enableval" = "yes" ; then









  APR_ADDTO(httxt2dbm_LTFLAGS, [-static])









else









  APR_REMOVEFROM(httxt2dbm, [-static])









fi









])









APACHE_SUBST(httxt2dbm_LTFLAGS)



















case $host in









    *aix*)









        # this works in any locale, unlike the default command below, which