From: Jeff Trawick Date: Thu, 7 Apr 2011 19:32:49 +0000 (+0000) Subject: don't build checkgid or fcgistarter on MinGW X-Git-Tag: 2.3.12~77 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68889a9dae0dc0464cb40e420e9dfd680ea79bff;p=thirdparty%2Fapache%2Fhttpd.git don't build checkgid or fcgistarter on MinGW PR: 49535 (subset of reported issues, replacement for supplied patch) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089950 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/support/Makefile.in b/support/Makefile.in index 92997b865ff..b840118b58f 100644 --- a/support/Makefile.in +++ b/support/Makefile.in @@ -3,7 +3,7 @@ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ CLEAN_TARGETS = suexec -PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm fcgistarter +PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT) TARGETS = $(PROGRAMS) PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) diff --git a/support/config.m4 b/support/config.m4 index 99bf7f7a5b4..4865e38ec25 100644 --- a/support/config.m4 +++ b/support/config.m4 @@ -114,6 +114,20 @@ fi ]) APACHE_SUBST(fcgistarter_LTFLAGS) +# Configure or check which of the non-portable support programs can be enabled. + +NONPORTABLE_SUPPORT="" +case $host in + *mingw*) + ;; + *) + NONPORTABLE_SUPPORT="checkgid fcgistarter" + ;; +esac +APACHE_SUBST(NONPORTABLE_SUPPORT) + +# Configure the ulimit -n command used by apachectl. + case $host in *aix*) # this works in any locale, unlike the default command below, which