denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wolfssl: Use pkg-config to check for wolfSSL

Browse Source 
The other checks trigger an automatic install of the old and incompatible
Ubuntu package on LGTM.
This commit is contained in:
Tobias Brunner
2020-01-30 17:12:05 +01:00
parent 04ce39e7c0
commit 2cb4af6696
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+3 -5
View File
@@ -1143,11 +1143,9 @@ if test x$openssl = xtrue; then
fi fi
if test x$wolfssl = xtrue; then if test x$wolfssl = xtrue; then
wolfssl_lib=wolfssl PKG_CHECK_MODULES(wolfssl, [wolfssl])
AC_CHECK_LIB([$wolfssl_lib],[wolfSSL_Init],[LIBS="$LIBS"], AC_SUBST(wolfssl_CFLAGS)
[AC_MSG_ERROR([wolfSSL lib$wolfssl_lib not found])],[$DLLIB]) AC_SUBST(wolfssl_LIBS)
AC_SUBST(WOLFSSL_LIB, [-l$wolfssl_lib])
AC_CHECK_HEADER([wolfssl/options.h],,[AC_MSG_ERROR([wolfSSL header wolfssl/options.h not found!])])
fi fi
if test x$gcrypt = xtrue; then if test x$gcrypt = xtrue; then
src/libstrongswan/plugins/wolfssl/Makefile.am
+3 -2
View File
@@ -2,7 +2,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libstrongswan
AM_CFLAGS = \ AM_CFLAGS = \
$(PLUGIN_CFLAGS) $(PLUGIN_CFLAGS) \
$(wolfssl_CFLAGS)
if MONOLITHIC if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-wolfssl.la noinst_LTLIBRARIES = libstrongswan-wolfssl.la
@@ -32,4 +33,4 @@ libstrongswan_wolfssl_la_SOURCES = \
libstrongswan_wolfssl_la_LDFLAGS = -module -avoid-version libstrongswan_wolfssl_la_LDFLAGS = -module -avoid-version
libstrongswan_wolfssl_la_LIBADD = $(WOLFSSL_LIB) libstrongswan_wolfssl_la_LIBADD = $(wolfssl_LIBS)