Merge branch revert-ap-ldap: Revert ap_ldap integration due to veto by Graham Leggett Mailing list threads: http://mail-archives.apache.org/mod_mbox/httpd-dev/201106.mbox/%3C4192DC1D-C0B9-42BB-B614-C3A41290F18B@sharp.fm%3E http://mail-archives.apache.org/mod_mbox/httpd-dev/201107.mbox/%3C4E15E51E.4090700@rowe-clan.net%3E

Fix include path relative to modules/ldap/

LDAP_DECLARE Header adjustment for nw/win32

Note util_ldap.h for convenience

Embed the .manifest files of all httpd binaries as a post-build operation. This ensures the exported (Studio 97 generated) .mak files create a usable Apache directly from the VC 8 (Studio 2005) command line environment.

Revert Revision 397647 While it solves the studio 2005 (we desire this), it breaks the studio 6 packaging (we require this). Discussion on list of practical solutions.

This resource /D syntax was pretty horridly imported into VS 2005, change the quotation to ensure a peaceful transition to sln/vcproj files.

Remove all /machine:I386 references, these are getting in the way of switching linkers from the x86 (default linker) to x64 or other possible target platforms. (Also, this commit cleans up lingering /GX switches from the 'BASE' options that are supposed to be unused).

s|/GX |/EHsc | because they were always synonyms, and Visual Studio 2005 edition complains bitterly and loudly that /GX is deprecated.

Remove a host of dependencies upon awk, using the same template for nearly every .rc compilation (giving the output .res file a different name for each component). Adds AP_SERVER_BASEPROJECT to ap_revision.h so we can display the proper name of "Apache HTTP Server" as opposed to AP_SERVER_BASEPRODUCT (which is, and should remain, simply "Apache" for the server string tokens.)

Reintroduce stack frame construction with /Oy- (removal was implied by /O2). This makes binaries far easier to debug, during operation and for post-crash .dmp analysis. Do not alter /Gs optimizations per brane. Reviewed by: stoddard, brane

Catch up for Win32 to authnz_ldap changes, and make win32's module for util_ldap features named mod_ldap.so as on Unix.