On 4/11/2017 3:16 PM, William A Rowe Jr wrote:
On Tue, Apr 11, 2017 at 11:36 AM, <gsm...@apache.org> wrote:
Author: gsmith
Date: Tue Apr 11 16:36:25 2017
New Revision: 1790999
URL: http://svn.apache.org/viewvc?rev=1790999&view=rev
Log:
Retro win32 command-line build
allow building with OpenSSL 1.1.0
ab.c (abs)
----------
applink.c has been moved in this version of OpenSSL
--- httpd/httpd/branches/2.4.x/support/ab.c (original)
+++ httpd/httpd/branches/2.4.x/support/ab.c Tue Apr 11 16:36:25 2017
@@ -175,8 +175,12 @@ typedef STACK_OF(X509) X509_STACK_TYPE;
* by the OpenSSL library build to another CRT used by the ab.exe build.
* This became especially problematic with Visual Studio 2015.
*/
+#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL)
+#include <../ms/applink.c>
+#else
#include <openssl/applink.c>
#endif
+#endif
This change is absolutely wrong, please revert. On no planet does
one '../' out of the system/additional includes path.
I would guess you are trying to get at a file in a source package?
There's no assurance we are looking at a source package, LIBS
and INCLUDES may be set up to point to the installed build+devel
resources.
If the defect is in OpenSSL, let's coordinate the fix upstream.
They will say fix ours. Bottom line, it's been moved from
include/openssl/applink.c to ms/applink.c
So, ok, will have to add /ms to the includes or do you have a better
suggestion?