Merge branch 'PHP-7.1'

* PHP-7.1:
  generate test ini file, so shared exts are loaded for nmake test
  additional env is generated for phpize, too

diff --cc win32/build/config.w32
index c727cf80819ac0e558dd2dcc4bd997d8c0e625dd,4c476e682aa9bd9e7d574b50ad07ea327e245d1f..188c1dc9e26a074080164c8c54e700b877534176
--- 1/win32/build/config.w32
--- 2/win32/build/config.w32
+++ b/win32/build/config.w32
@@@ -298,8 -294,9 +298,15 @@@ toolset_setup_codegen_arch()
  
  ARG_WITH("all-shared", "Force all the non obligatory extensions to be shared", "no");
  
 +// Config profiles (--with-config-profile=<name>) will save a certain config to php-src/config.<name>.bat
 +// so that it can be executed like: cofig.<name> instead of a long list of parameters
 +//
 +// Note, nice as a name is disallowed and will generate a warning and skip saving
 +ARG_WITH('config-profile', 'Name of the configuration profile to save this to in php-src/config.name.bat', 'no');
++
+ ARG_ENABLE("test-ini", "Enable automatic php.ini generation. The test.ini will be put \
+               into the build dir and used to automatically load the shared extensions.", "yes");
+ 
+ ARG_WITH("test-ini-ext-exclude", "Comma separated list of shared extensions to \
+               be excluded from the test.ini", "no");
+ 

diff --cc win32/build/confutils.js
Simple merge