diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/opensslconf.h.in | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/opensslconf.h.in')
| -rw-r--r-- | src/lib/libcrypto/opensslconf.h.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/opensslconf.h.in b/src/lib/libcrypto/opensslconf.h.in index 685e83b7a3..cee83acf98 100644 --- a/src/lib/libcrypto/opensslconf.h.in +++ b/src/lib/libcrypto/opensslconf.h.in | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ | 6 | #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ |
| 7 | #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) | 7 | #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) |
| 8 | #define ENGINESDIR "/usr/local/lib/engines" | ||
| 8 | #define OPENSSLDIR "/usr/local/ssl" | 9 | #define OPENSSLDIR "/usr/local/ssl" |
| 9 | #endif | 10 | #endif |
| 10 | #endif | 11 | #endif |