diff options
| author | John Hurst <jhurst@cinecert.com> | 2021-01-15 08:33:06 -0800 |
|---|---|---|
| committer | John Hurst <jhurst@cinecert.com> | 2021-01-15 08:33:06 -0800 |
| commit | b5e47e45509ce3a1a696ef06583ef86a5e1e8223 (patch) | |
| tree | 401c07cac589c502ca3a3ff38064cfd3a21ba160 | |
| parent | f69df80edc00a138f50fd527706c78617342dcdd (diff) | |
Fixed lingering openssl build issue for autotools build
| -rw-r--r-- | m4/ax_lib_openssl.m4 | 2 | ||||
| -rwxr-xr-x | src/KM_prng.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/m4/ax_lib_openssl.m4 b/m4/ax_lib_openssl.m4 index 9e94b94..074bdfb 100644 --- a/m4/ax_lib_openssl.m4 +++ b/m4/ax_lib_openssl.m4 @@ -284,7 +284,7 @@ SSLeay(); fi fi if test "$HAVE_OPENSSL" = "yes"; then - CPPFLAGS="$CPPFLAGS $OPENSSL_CPPFLAGS -DHAVE_SSL=1" + CPPFLAGS="$CPPFLAGS $OPENSSL_CPPFLAGS -DHAVE_OPENSSL=1" LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS $OPENSSL_LIBS" else HAVE_OPENSSL="no" diff --git a/src/KM_prng.cpp b/src/KM_prng.cpp index 43f632b..f40d846 100755 --- a/src/KM_prng.cpp +++ b/src/KM_prng.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2006-2009, John Hurst +Copyright (c) 2006-2021, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -37,11 +37,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <string.h> #include <assert.h> -#define ENABLE_FIPS_186 -#ifdef ENABLE_FIPS_186 -#include <openssl/sha.h> -#include <openssl/bn.h> -#endif // ENABLE_FIPS_186 +#ifdef HAVE_OPENSSL +# define ENABLE_FIPS_186 +# include <openssl/sha.h> +# include <openssl/bn.h> +#endif // HAVE_OPENSSL using namespace Kumu; |