[packages/php.git] / php-nohttpd.patch

--- php-5.4.20/sapi/apache2handler/config.m4~	2013-09-18 08:48:57.000000000 +0300
+++ php-5.4.20/sapi/apache2handler/config.m4	2013-09-27 00:14:09.307972159 +0300
@@ -60,9 +60,9 @@
 
   # Test that we're trying to configure with apache 2.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
-  if test "$APACHE_VERSION" -le 2000000; then
+  if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then
     AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropriate switch --with-apxs (without the 2)])
-  elif test "$APACHE_VERSION" -lt 2000044; then
+  elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then
     AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
   fi
Commit	Line	Data
	1	--- php-5.4.20/sapi/apache2handler/config.m4~ 2013-09-18 08:48:57.000000000 +0300
	2	+++ php-5.4.20/sapi/apache2handler/config.m4 2013-09-27 00:14:09.307972159 +0300
	3	@@ -60,9 +60,9 @@
	4
	5	# Test that we're trying to configure with apache 2.x
	6	PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
	7	- if test "$APACHE_VERSION" -le 2000000; then
	8	+ if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then
	9	AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)])
	10	- elif test "$APACHE_VERSION" -lt 2000044; then
	11	+ elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then
	12	AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
	13	fi
	14