]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
don't build checkgid or fcgistarter on MinGW
authorJeff Trawick <trawick@apache.org>
Thu, 7 Apr 2011 19:32:49 +0000 (19:32 +0000)
committerJeff Trawick <trawick@apache.org>
Thu, 7 Apr 2011 19:32:49 +0000 (19:32 +0000)
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

support/Makefile.in
support/config.m4

index 92997b865ff8f9e342b21ff6dd9e6a74f500162f..b840118b58f9f34be0f2cee97e022c798fa9b5c8 100644 (file)
@@ -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)
index 99bf7f7a5b40e96a4dcf20754b59f51853f57b2d..4865e38ec25e1fe92cee71e6f38a4330da25b53f 100644 (file)
@@ -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