More splitting as suggested by minfrin.

[apache] / support / config.m4

diff --git a/support/config.m4 b/support/config.m4
index ad52a8c03c271f0717beaa6c130bb70196c764cf..99bf7f7a5b40e96a4dcf20754b59f51853f57b2d 100644 (file)
--- a/support/config.m4
+++ b/support/config.m4
@@ -5,8 +5,11 @@ 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 the support binaries),[
+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
   APR_ADDTO(htpasswd_LTFLAGS, [-static])
   APR_ADDTO(htdigest_LTFLAGS, [-static])
@@ -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,9 +87,51 @@ fi
 ])
 APACHE_SUBST(checkgid_LTFLAGS)
 
-if TMP_ULIMIT=`ulimit -H -n` && ulimit -S -n $TMP_ULIMIT ; then
-  APACHECTL_ULIMIT="ulimit -S -n \`ulimit -H -n\`"
+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
-  APACHECTL_ULIMIT=""
+  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
+        # fails in a non-English locale if the hard limit is unlimited
+        # since the display of the limit will translate "unlimited", but
+        # ulimit only accepts English "unlimited" on input
+        APACHECTL_ULIMIT="ulimit -S -n unlimited"
+        ;;
+    *alpha*-dec-osf*)
+        # Tru64: -H is for setting, not retrieving
+        APACHECTL_ULIMIT="ulimit -S -n \`ulimit -h -n\`"
+        ;;
+    *)
+        if TMP_ULIMIT=`ulimit -H -n` && ulimit -S -n $TMP_ULIMIT >/dev/null 2>&1; then
+            APACHECTL_ULIMIT="ulimit -S -n \`ulimit -H -n\`"
+        else
+            APACHECTL_ULIMIT=""
+        fi
+        ;;
+esac
 APACHE_SUBST(APACHECTL_ULIMIT)