Allow statically linked support binaries with the new

--enable-static-support flag, and enable this behavior in
the binbuild script. Also add a new --enable-static-htdbm
flag.

BTW, this takes care of 7/8th of a showstopper.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93331 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 41 insertions, 10 deletions

diff --git a/support/config.m4 b/support/config.m4
index f04ae26b0c..5dd691f89e 100644
--- a/support/config.m4
+++ b/support/config.m4
@@ -1,52 +1,83 @@
-
-
 htpasswd_LTFLAGS=""
 htdigest_LTFLAGS=""
 rotatelogs_LTFLAGS=""
 logresolve_LTFLAGS=""
+htdbm_LTFLAGS=""
 ab_LTFLAGS=""
+checkgid_LTFLAGS=""
 
-dnl XXX Should we change the foo_LTFLAGS="-static" settings below
-dnl to something like APR_ADDTO? -aaron
+AC_ARG_ENABLE(static-support,APACHE_HELP_STRING(--enable-static-support,Build a statically linked version the support binaries),[
+if test "$enableval" = "yes" ; then
+  APR_ADDTO(htpasswd_LTFLAGS, [-static])
+  APR_ADDTO(htdigest_LTFLAGS, [-static])
+  APR_ADDTO(rotatelogs_LTFLAGS, [-static])
+  APR_ADDTO(logresolve_LTFLAGS, [-static])
+  APR_ADDTO(htdbm_LTFLAGS, [-static])
+  APR_ADDTO(ab_LTFLAGS, [-static])
+  APR_ADDTO(checkgid_LTFLAGS, [-static])
+fi
+])
 
 AC_ARG_ENABLE(static-htpasswd,APACHE_HELP_STRING(--enable-static-htpasswd,Build a statically linked version of htpasswd),[
 if test "$enableval" = "yes" ; then
-  htpasswd_LTFLAGS="-static"
+  APR_ADDTO(htpasswd_LTFLAGS, [-static])
+else
+  APR_REMOVEFROM(htpasswd_LTFLAGS, [-static])
 fi
 ])
 APACHE_SUBST(htpasswd_LTFLAGS)
 
 AC_ARG_ENABLE(static-htdigest,APACHE_HELP_STRING(--enable-static-htdigest,Build a statically linked version of htdigest),[
 if test "$enableval" = "yes" ; then
-  htdigest_LTFLAGS="-static"
+  APR_ADDTO(htdigest_LTFLAGS, [-static])
+else
+  APR_REMOVEFROM(htdigest_LTFLAGS, [-static])
 fi
 ])
 APACHE_SUBST(htdigest_LTFLAGS)
 
 AC_ARG_ENABLE(static-rotatelogs,APACHE_HELP_STRING(--enable-static-rotatelogs,Build a statically linked version of rotatelogs),[
 if test "$enableval" = "yes" ; then
-  rotatelogs_LTFLAGS="-static"
+  APR_ADDTO(rotatelogs_LTFLAGS, [-static])
+else
+  APR_REMOVEFROM(rotatelogs_LTFLAGS, [-static])
 fi
 ])
 APACHE_SUBST(rotatelogs_LTFLAGS)
 
 AC_ARG_ENABLE(static-logresolve,APACHE_HELP_STRING(--enable-static-logresolve,Build a statically linked version of logresolve),[
 if test "$enableval" = "yes" ; then
-  logresolve_LTFLAGS="-static"
+  APR_ADDTO(logresolve_LTFLAGS, [-static])
+else
+  APR_REMOVEFROM(logresolve_LTFLAGS, [-static])
 fi
 ])
 APACHE_SUBST(logresolve_LTFLAGS)
 
+AC_ARG_ENABLE(static-htdbm,APACHE_HELP_STRING(--enable-static-htdbm,Build a statically linked version of htdbm),[
+if test "$enableval" = "yes" ; then
+  APR_ADDTO(htdbm_LTFLAGS, [-static])
+else
+  APR_REMOVEFROM(htdbm_LTFLAGS, [-static])
+fi
+])
+APACHE_SUBST(htdbm_LTFLAGS)
+
 AC_ARG_ENABLE(static-ab,APACHE_HELP_STRING(--enable-static-ab,Build a statically linked version of ab),[
 if test "$enableval" = "yes" ; then
-  ab_LTFLAGS="-static"
+  APR_ADDTO(ab_LTFLAGS, [-static])
+else
+  APR_REMOVEFROM(ab_LTFLAGS, [-static])
 fi
 ])
 APACHE_SUBST(ab_LTFLAGS)
 
 AC_ARG_ENABLE(static-checkgid,APACHE_HELP_STRING(--enable-static-checkgid,Build a statically linked version of checkgid),[
 if test "$enableval" = "yes" ; then
-  checkgid_LTFLAGS="-static"
+  APR_ADDTO(checkgid_LTFLAGS, [-static])
+else
+  APR_REMOVEFROM(checkgid_LTFLAGS, [-static])
 fi
 ])
 APACHE_SUBST(checkgid_LTFLAGS)
+