Commit cca43b23 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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:  Jeff Trawick



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@441796 13f79535-47bb-0310-9956-ffa450edef68
parent 78c2de35
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@
Changes with Apache 2.3.0
  [Remove entries to the current 2.0 and 2.2 section below, when backported]
  *) Allow htcacheclean, httxt2dbm, and fcgistarter to link apr/apr-util
     statically like the older support programs.
     [Eric Covener <covener gmail.com>]
  *) The full server version information is now included in the error log at
     startup as well as server status reports, irrespective of the setting
     of the ServerTokens directive.  Third-party modules must now use
+33 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ logresolve_LTFLAGS=""
htdbm_LTFLAGS=""
ab_LTFLAGS=""
checkgid_LTFLAGS=""
htcacheclean_LTFLAGS=""
httxt2dbm_LTFLAGS=""
fcgistarter_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 +18,9 @@ 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])
  APR_ADDTO(fcgistarter_LTFLAGS, [-static])
fi
])

@@ -81,6 +87,33 @@ 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)

AC_ARG_ENABLE(static-fcgistarter,APACHE_HELP_STRING(--enable-static-fcgistarter,Build a statically linked version of fcgistarter),[
if test "$enableval" = "yes" ; then
  APR_ADDTO(fcgistarter_LTFLAGS, [-static])
else
  APR_REMOVEFROM(fcgistarter, [-static])
fi
])
APACHE_SUBST(fcgistarter_LTFLAGS)

case $host in
    *aix*)
        # this works in any locale, unlike the default command below, which