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

Diff for /embedaddon/php/win32/build/config.w32 between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:48:06 version 1.1.1.2, 2012/05/29 12:34:34
Line 19  if (!PHP_CL) { Line 19  if (!PHP_CL) {
 // Which version of the compiler do we have?  // Which version of the compiler do we have?
 VCVERS = probe_binary(PHP_CL).substr(0, 5).replace('.', '');  VCVERS = probe_binary(PHP_CL).substr(0, 5).replace('.', '');
 STDOUT.WriteLine("  Detected compiler " + VC_VERSIONS[VCVERS]);  STDOUT.WriteLine("  Detected compiler " + VC_VERSIONS[VCVERS]);
   
   if (VCVERS < 1500) {
           ERROR("Unsupported MS C++ Compiler, VC9 (2008) minimum is required");
   }
   
 AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], "Detected compiler version");  AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], "Detected compiler version");
 DEFINE("PHP_COMPILER_SHORT", VC_VERSIONS_SHORT[VCVERS]);  DEFINE("PHP_COMPILER_SHORT", VC_VERSIONS_SHORT[VCVERS]);
 AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], "Compiler compatibility ID");  AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], "Compiler compatibility ID");
Line 100  ARG_ENABLE('debug-pack', 'Release binaries with extern Line 105  ARG_ENABLE('debug-pack', 'Release binaries with extern
 if (PHP_DEBUG == "yes" && PHP_DEBUG_PACK == "yes") {  if (PHP_DEBUG == "yes" && PHP_DEBUG_PACK == "yes") {
         ERROR("Use of both --enable-debug and --enable-debug-pack not allowed.");          ERROR("Use of both --enable-debug and --enable-debug-pack not allowed.");
 }  }
   
   ARG_ENABLE('pgi', 'Generate PGO instrumented binaries', 'no');
   ARG_WITH('pgo', 'Compile optimized binaries using training data from folder', 'no');
   if (PHP_PGI == "yes" || PHP_PGO != "no") {
           PGOMGR = PATH_PROG('pgomgr', WshShell.Environment("Process").Item("PATH"));
           if (!PGOMGR) {
                   ERROR("--enable-pgi and --with-pgo options can only be used if PGO capable compiler is present.");
           }
           if (PHP_PGI == "yes" && PHP_PGO != "no") {
                   ERROR("Use of both --enable-pgi and --with-pgo not allowed.");
           }
   }
   
 ARG_ENABLE('zts', 'Thread safety', 'yes');  ARG_ENABLE('zts', 'Thread safety', 'yes');
 // Configures the hard-coded installation dir  // Configures the hard-coded installation dir
 ARG_WITH('prefix', 'where PHP will be installed', '');  ARG_WITH('prefix', 'where PHP will be installed', '');
Line 229  if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") { Line 247  if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
         DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");          DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
 }  }
   
   // CFLAGS, LDFLAGS and BUILD_DIR are defined
   // Add compiler and link flags if PGO options are selected
   if (PHP_DEBUG != "yes" && PHP_PGI == "yes") {
           ADD_FLAG('CFLAGS', "/GL /O2");
           ADD_FLAG('LDFLAGS', "/LTCG:PGINSTRUMENT");
           DEFINE("PGOPGD_DIR", "$(BUILD_DIR)");
   }
   else if (PHP_DEBUG != "yes" && PHP_PGO != "no") {
           ADD_FLAG('CFLAGS', "/GL /O2");
           ADD_FLAG('LDFLAGS', "/LTCG:PGUPDATE");
           DEFINE("PGOPGD_DIR", ((PHP_PGO.length == 0 || PHP_PGO == "yes") ? "$(BUILD_DIR)" : PHP_PGO));
   }
   
 // Find the php_build dir - it contains headers and libraries  // Find the php_build dir - it contains headers and libraries
 // that we need  // that we need
 ARG_WITH('php-build', 'Path to where you extracted the development libraries (http://wiki.php.net/internals/windows/libs). Assumes that it is a sibling of this source dir (..\\deps) if not specified', 'no');  ARG_WITH('php-build', 'Path to where you extracted the development libraries (http://wiki.php.net/internals/windows/libs). Assumes that it is a sibling of this source dir (..\\deps) if not specified', 'no');
Line 328  ADD_SOURCES("Zend", "zend_language_parser.c zend_langu Line 359  ADD_SOURCES("Zend", "zend_language_parser.c zend_langu
         zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \          zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
         zend_object_handlers.c zend_objects_API.c \          zend_object_handlers.c zend_objects_API.c \
         zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \          zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \
        zend_float.c zend_canary.c zend_alloc_canary.c");        zend_float.c zend_string.c");
   
 if (VCVERS == 1200) {  if (VCVERS == 1200) {
         AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);          AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
 }  }
   
ADD_SOURCES("main", "main.c snprintf.c spprintf.c safe_mode.c getopt.c fopen_wrappers.c \ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \
         php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \          php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
         strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c network.c \          strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c network.c \
         php_open_temporary_file.c php_logos.c output.c internal_functions.c php_sprintf.c");          php_open_temporary_file.c php_logos.c output.c internal_functions.c php_sprintf.c");
Line 358  PHP_INSTALL_HEADERS("", "Zend/ TSRM/ main/ main/stream Line 389  PHP_INSTALL_HEADERS("", "Zend/ TSRM/ main/ main/stream
   
 STDOUT.WriteBlankLines(1);  STDOUT.WriteBlankLines(1);
   
   
 /* Can we build with IPv6 support? */  /* Can we build with IPv6 support? */
 ARG_ENABLE("ipv6", "Disable IPv6 support (default is turn it on if available)", "yes");  ARG_ENABLE("ipv6", "Disable IPv6 support (default is turn it on if available)", "yes");
   
Line 377  AC_DEFINE('HAVE_IPV6', main_network_has_ipv6); Line 409  AC_DEFINE('HAVE_IPV6', main_network_has_ipv6);
 ARG_ENABLE('fd-setsize', "Set maximum number of sockets for select(2)", "256");  ARG_ENABLE('fd-setsize', "Set maximum number of sockets for select(2)", "256");
 ADD_FLAG("CFLAGS", "/D FD_SETSIZE=" + parseInt(PHP_FD_SETSIZE));  ADD_FLAG("CFLAGS", "/D FD_SETSIZE=" + parseInt(PHP_FD_SETSIZE));
   
 ARG_ENABLE("zend-multibyte", "Enable Zend multibyte encoding support", "no");  
 if (PHP_ZEND_MULTIBYTE == "yes") {  
    STDOUT.WriteLine("Enabling Zend multibyte encoding support");  
    AC_DEFINE('ZEND_MULTIBYTE', 1);  
 }  
    
 AC_DEFINE('HAVE_USLEEP', 1);  AC_DEFINE('HAVE_USLEEP', 1);
 AC_DEFINE('HAVE_STRCOLL', 1);  AC_DEFINE('HAVE_STRCOLL', 1);
 AC_DEFINE('SUHOSIN_PATCH', 1);  
   
 /* For snapshot builders, where can we find the additional  /* For snapshot builders, where can we find the additional
  * files that make up the snapshot template? */   * files that make up the snapshot template? */
Line 409  if (PHP_DSP != "no") { Line 434  if (PHP_DSP != "no") {
         FSO.CreateFolder("tmp");          FSO.CreateFolder("tmp");
 }  }
   
ARG_ENABLE("security-flags", "Enable the compiler security flags", "no");ARG_ENABLE("security-flags", "Disable the compiler security flags", "yes");
 if (PHP_SECURITY_FLAGS == "yes") {  if (PHP_SECURITY_FLAGS == "yes") {
         ADD_FLAG("LDFLAGS", "/NXCOMPAT /DYNAMICBASE ");          ADD_FLAG("LDFLAGS", "/NXCOMPAT /DYNAMICBASE ");
 }  }
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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