[BACK]Return to config.w32 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / sapi / apache2handler

Diff for /embedaddon/php/sapi/apache2handler/config.w32 between versions 1.1 and 1.1.1.3

version 1.1, 2012/02/21 23:48:06 version 1.1.1.3, 2013/07/22 01:32:13
Line 5  ARG_ENABLE('apache2handler', 'Build Apache 2.x handler Line 5  ARG_ENABLE('apache2handler', 'Build Apache 2.x handler
   
 if (PHP_APACHE2HANDLER != "no") {  if (PHP_APACHE2HANDLER != "no") {
         if (PHP_ZTS == "no") {          if (PHP_ZTS == "no") {
                WARNING("Apache2 module requires an --enable-zts build of PHP on windows");                WARNING("Apache 2.0 module requires an --enable-zts build of PHP on windows");
         } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\include\\apache2") &&          } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\include\\apache2") &&
                         CHECK_LIB("libhttpd.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") &&                          CHECK_LIB("libhttpd.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") &&
                         CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") &&                          CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") &&
Line 23  ARG_ENABLE('apache2-2handler', 'Build Apache 2.2.x han Line 23  ARG_ENABLE('apache2-2handler', 'Build Apache 2.2.x han
   
 if (PHP_APACHE2_2HANDLER != "no") {  if (PHP_APACHE2_2HANDLER != "no") {
         if (PHP_ZTS == "no") {          if (PHP_ZTS == "no") {
                WARNING("Apache2 module requires an --enable-zts build of PHP on windows");                WARNING("Apache 2.2 module requires an --enable-zts build of PHP on windows");
         } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") &&          } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") &&
                         CHECK_LIB("libhttpd.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") &&                          CHECK_LIB("libhttpd.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") &&
                         CHECK_LIB("libapr-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") &&                          CHECK_LIB("libapr-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") &&
Line 37  if (PHP_APACHE2_2HANDLER != "no") { Line 37  if (PHP_APACHE2_2HANDLER != "no") {
                 WARNING("Could not find apache2.2 libraries/headers");                  WARNING("Could not find apache2.2 libraries/headers");
         }          }
 }  }
   
   ARG_ENABLE('apache2-4handler', 'Build Apache 2.4.x handler', 'no');
   if (PHP_APACHE2_4HANDLER != "no") {
           if (PHP_ZTS == "no") {
                   WARNING("Apache 2.4 module requires an --enable-zts build of PHP on windows");
           } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_4HANDLER", PHP_PHP_BUILD + "\\include\\apache2_4") &&
                           CHECK_LIB("libhttpd.lib", "apache2_4handler", PHP_PHP_BUILD + "\\lib\\apache2_4") &&
                           CHECK_LIB("libapr-1.lib", "apache2_4handler", PHP_PHP_BUILD + "\\lib\\apache2_4") &&
                           CHECK_LIB("libaprutil-1.lib", "apache2_4handler", PHP_PHP_BUILD + "\\lib\\apache2_4")
                           ) {
                   SAPI('apache2_4handler', 'mod_php5.c sapi_apache2.c apache_config.c php_functions.c',
                                   'php' + PHP_VERSION + 'apache2_4.dll',
                                   '/D PHP_APACHE2_EXPORTS /I win32',
                                   'sapi\\apache2handler');
           } else {
                   WARNING("Could not find apache 2.4 libraries/headers");
           }
   }
   
Removed from v.1.1  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>