jani                                     Fri, 19 Nov 2010 08:26:47 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=305553

Log:
- Merged check from trunk to prevent building multiple SAPIs (bug #52419)

Bug: http://bugs.php.net/52419 (Closed) Unable to compile PHP with both Apache2 
and FPM support
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/acinclude.m4

Modified: php/php-src/branches/PHP_5_3/acinclude.m4
===================================================================
--- php/php-src/branches/PHP_5_3/acinclude.m4   2010-11-19 05:30:04 UTC (rev 
305552)
+++ php/php-src/branches/PHP_5_3/acinclude.m4   2010-11-19 08:26:47 UTC (rev 
305553)
@@ -878,6 +878,17 @@
 dnl objects.
 dnl
 AC_DEFUN([PHP_SELECT_SAPI],[
+  if test "$PHP_SAPI" != "default"; then
+AC_MSG_ERROR([
++--------------------------------------------------------------------+
+|                        *** ATTENTION ***                           |
+|                                                                    |
+| You've configured multiple SAPIs to be build. You can build only   |
+| one SAPI module and CLI binary at the same time.                   |
++--------------------------------------------------------------------+
+])
+  fi
+
   PHP_SAPI=$1

   case "$2" in

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to