Hello everyone, since Guenter started to clean up the general mingw32-make makefiles, I would like to provide patches to clean up the winbuild nmake makefiles while still providing backwards compatibility.
Attached you will find a set of 3 patches: [PATCH 1/3] winbuild: Clean up formatting and variable naming - Changed space usage to line up with the whole file - Renamed CFLAGS_SSPI/IPV6 to SSPI/IPV6_CFLAGS to be consistent with the other CFLAGS_x variables - Make use of existing CFLAGS_IPV6 (previously IPV6_CFLAGS) instead of appending directly to CFLAGS [PATCH 2/3] winbuild: Aligned USE_SSPI with other USE_x defines Renamed external parameter USE_SSPI = yes/no to ENABLE_SSPI = yes/no. Backwards compatible change: USE_SSPI can still be passed as external parameter with yes/no value as long as ENABLE_SSPI is not given. USE_x defines are passed around with true/false values internally, USE_SSPI is now aligned to this approach, but still accepts external values yes/no being passed, just like the other defines. [PATCH 3/3] winbuild: Make USE_WINSSL depend on USE_SSPI Since WinSSL cannot be build without SSPI being enabled, USE_WINSSL now defaults to the value of USE_SSPI. The makefile does now raise an error if WinSSL is enabled while SSPI is disabled. -- I tried to explain everything in the patch files and now I would like to get your feedback on this changes. The only backwards incompatible change would be that WinSSL now required SSPI to be enabled, but that shouldn't be a problem since that is the default. I basically just tied the default of WinSSL to the SSPI setting and error out if SSPI is not enabled while building with WinSSL. If you think the patches are already ready to be pushed, please do so. Thanks in advance! Best regards, Marc
0001-winbuild-Clean-up-formatting-and-variable-naming.patch
Description: Binary data
0002-winbuild-Aligned-USE_SSPI-with-other-USE_x-defines.patch
Description: Binary data
0003-winbuild-Make-USE_WINSSL-depend-on-USE_SSPI.patch
Description: Binary data
------------------------------------------------------------------- List admin: http://cool.haxx.se/list/listinfo/curl-library Etiquette: http://curl.haxx.se/mail/etiquette.html
