diff options
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/openssl/Makefile.am | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 754b49281..803c7258d 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/libstrongswan/plugins/openssl/Makefile.am b/src/libstrongswan/plugins/openssl/Makefile.am index a7ffefd82..9287f788a 100644 --- a/src/libstrongswan/plugins/openssl/Makefile.am +++ b/src/libstrongswan/plugins/openssl/Makefile.am @@ -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) |