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

diff --git a/CHANGES b/CHANGES
index e6671a16757a9bbe3ab94389ba922063bfb589cc..db8e68ffa20bdd6afda19ff932281283a797e697 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                         -*- 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>]
 

diff --git a/STATUS b/STATUS
index 1998bcd8d3c15ba94304088a1ebdb08384e287a1..5576e5ed8190550b26c9475354f87aedd676c39c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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:
 

diff --git a/support/config.m4 b/support/config.m4
index cb2322ec8cf5efd21c51ab3ef71104faf9f8e750..f91103753b7337206d4675ebfb953a4c43f2fb06 100644 (file)
--- a/support/config.m4
+++ b/support/config.m4
@@ -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