httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1089950 - in /httpd/httpd/trunk/support: Makefile.in config.m4
Date Thu, 07 Apr 2011 19:32:49 GMT
Author: trawick
Date: Thu Apr  7 19:32:49 2011
New Revision: 1089950

URL: http://svn.apache.org/viewvc?rev=1089950&view=rev
Log:
don't build checkgid or fcgistarter on MinGW

PR: 49535 (subset of reported issues, replacement for supplied patch)

Modified:
    httpd/httpd/trunk/support/Makefile.in
    httpd/httpd/trunk/support/config.m4

Modified: httpd/httpd/trunk/support/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/Makefile.in?rev=1089950&r1=1089949&r2=1089950&view=diff
==============================================================================
--- httpd/httpd/trunk/support/Makefile.in (original)
+++ httpd/httpd/trunk/support/Makefile.in Thu Apr  7 19:32:49 2011
@@ -3,7 +3,7 @@ DISTCLEAN_TARGETS = apxs apachectl dbmma
 
 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)

Modified: httpd/httpd/trunk/support/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/config.m4?rev=1089950&r1=1089949&r2=1089950&view=diff
==============================================================================
--- httpd/httpd/trunk/support/config.m4 (original)
+++ httpd/httpd/trunk/support/config.m4 Thu Apr  7 19:32:49 2011
@@ -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



Mime
View raw message