Skip to content

Commit

Permalink
Check for the openssl library and always assign OPENSSL_LIBS
Browse files Browse the repository at this point in the history
Without the patch, the build variable OPENSSL_LIBS is only assigned when
`ovis_auth` is enabled. However, LDMS uses OpenSSL to generate digests
for LDMS Sets. The patch ensures that OPENSSL_LIBS is always populated.
  • Loading branch information
nichamon authored and tom95858 committed Feb 2, 2024
1 parent 48b6d83 commit 3cbd73e
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,11 @@ AM_CONDITIONAL([ENABLE_libibverbs], [test "$HAVE_libibverbs" = "yes"])
AM_CONDITIONAL([ENABLE_librdmacm], [test "$HAVE_librdmacm" = "yes"])

AC_DEFINE_UNQUOTED([HAVE_ZAP],["$have_zap"],[configured with zap transport (1) or not (0)])
AX_CHECK_OPENSSL([],[AC_MSG_ERROR([openssl not found, and required by ldms])])

have_auth=0
if test "$enable_ovis_auth" = "yes"; then
have_auth=1
AX_CHECK_OPENSSL([],[AC_MSG_ERROR([openssl not found, and required by ovis_auth])])
AUTH_LIB="-lovis_auth"
else
AUTH_LIB=""
Expand All @@ -211,7 +211,6 @@ AC_DEFINE_UNQUOTED([HAVE_AUTH],[$have_auth],[configured with authentication (1)

OPTION_DEFAULT_ENABLE([sock], [ENABLE_SOCK])
OPTION_DEFAULT_DISABLE([ugni], [ENABLE_UGNI])
OPTION_DEFAULT_DISABLE([ssl], [ENABLE_SSL])
OPTION_DEFAULT_DISABLE([zaptest], [ENABLE_ZAPTEST])
OPTION_DEFAULT_DISABLE([ovis_event_test], [ENABLE_OVIS_EVENT_TEST])
OPTION_DEFAULT_DISABLE([ovis_ev_test], [ENABLE_OVIS_EV_TEST])
Expand Down

0 comments on commit 3cbd73e

Please sign in to comment.