ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

openssl: Check and link against libeay32 instead of libcrypto on Windows 

Most Windows OpenSSL builds come with the crypto library named libeay32.
This commit is contained in:
Martin Willi 2013-10-25 17:28:13 +02:00
parent f3c809e615
commit b7a4d44bd0
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -733,9 +733,18 @@ AC_COMPILE_IFELSE(
# error WIN32 undefined
#endif
]])],
[AC_MSG_RESULT([yes]); windows=true ],
[AC_MSG_RESULT([no]); AC_SUBST(PLUGIN_CFLAGS, [-rdynamic])]
[
AC_MSG_RESULT([yes])
windows=true
openssl_lib=eay32
],
[
AC_MSG_RESULT([no])
openssl_lib=crypto
AC_SUBST(PLUGIN_CFLAGS, [-rdynamic])
]
)
AC_SUBST(OPENSSL_LIB, [-l$openssl_lib])
AM_CONDITIONAL(USE_WINDOWS, [test "x$windows" = xtrue])
if test x$printf_hooks = xvstr; then
@ -918,7 +927,7 @@ if test x$sqlite = xtrue; then
fi
if test x$openssl = xtrue; then
AC_CHECK_LIB([crypto],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([OpenSSL crypto library not found])],[])
AC_CHECK_LIB([$openssl_lib],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([OpenSSL lib$openssl_lib not found])],[])
AC_CHECK_HEADER([openssl/evp.h],,[AC_MSG_ERROR([OpenSSL header openssl/evp.h not found!])])
fi

2
src/libstrongswan/plugins/openssl/Makefile.am
View File

@ -32,4 +32,4 @@ libstrongswan_openssl_la_SOURCES = \
openssl_gcm.c openssl_gcm.h
libstrongswan_openssl_la_LDFLAGS = -module -avoid-version
libstrongswan_openssl_la_LIBADD = -lcrypto
libstrongswan_openssl_la_LIBADD = $(OPENSSL_LIB)