X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fopensslconf.h.in;h=cee83acf9898b43b5c5e4fbc9ca0cf76e8fefd48;hb=cdd0f3b328cc84dbeb13081384905f98765a756f;hp=e849fe688a252b90332fe0729fe0ac1f5ffa2e49;hpb=f3a3106807434a4a8a81460e98d9b805ed876ff3;p=oweals%2Fopenssl.git

diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
index e849fe688a..cee83acf98 100644
--- a/crypto/opensslconf.h.in
+++ b/crypto/opensslconf.h.in
@@ -5,6 +5,7 @@
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
+#define ENGINESDIR "/usr/local/lib/engines"
 #define OPENSSLDIR "/usr/local/ssl"
 #endif
 #endif
@@ -47,7 +48,7 @@
 #endif
 #endif
 
-#if defined(HEADER_DES_H) && !defined(DES_LONG)
+#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
 /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
  * %20 speed up (longs are 8 bytes, int's are 4). */
 #ifndef DES_LONG
@@ -147,7 +148,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 #  define DES_PTR
 #  define DES_RISC2
 #  define DES_UNROLL
-#elif defined( i386 )		/* x86 boxes, should be gcc */
+#elif defined(i386) || defined(__i386__)	/* x86 boxes, should be gcc */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL