Skip to content

Commit

Permalink
configure: Fix building without OpenSSL
Browse files Browse the repository at this point in the history
AM_CONDITIONAL() needs to be part of the code path that is always run,
or it fails with:

configure: error: conditional "SSL_VERSION_GE_102" was never defined.
  • Loading branch information
sirainen committed Dec 4, 2016
1 parent 4865422 commit f7f4b65
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions configure.ac
Expand Up @@ -1715,8 +1715,6 @@ if test $want_openssl != no && test $have_ssl = no; then
#endif]], [[ return 0; ]])], [ssl_version_ge_102=true], [ssl_version_ge_102=false])
AC_MSG_RESULT([$ssl_version_ge_102])

AM_CONDITIONAL([SSL_VERSION_GE_102], [test x$ssl_version_ge_102 = xtrue])

# SSL_clear_options introduced in openssl 0.9.8m but may be backported to
# older versions in "enterprise" OS releases; originally implemented as a
# macro but as a function in more recent openssl versions
Expand Down Expand Up @@ -1758,6 +1756,7 @@ if test $want_openssl != no && test $have_ssl = no; then
fi
fi
fi
AM_CONDITIONAL([SSL_VERSION_GE_102], [test x$ssl_version_ge_102 = xtrue])

AM_CONDITIONAL(BUILD_OPENSSL, test "$have_openssl" = "yes")
AM_CONDITIONAL(BUILD_DCRYPT_OPENSSL, test "$build_dcrypt_openssl" = "yes")
Expand Down

0 comments on commit f7f4b65

Please sign in to comment.