mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-08-02 20:24:39 +02:00
Merge pull request #6867 from cconlon/jniConfigExpand
Update "--enable-jni" to include additional defines
This commit is contained in:
14
configure.ac
14
configure.ac
@@ -5955,7 +5955,7 @@ AC_ARG_ENABLE([jni],
|
|||||||
)
|
)
|
||||||
if test "$ENABLED_JNI" = "yes"
|
if test "$ENABLED_JNI" = "yes"
|
||||||
then
|
then
|
||||||
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_JNI -DHAVE_EX_DATA"
|
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_JNI -DHAVE_EX_DATA -DKEEP_PEER_CERT"
|
||||||
|
|
||||||
# Enable prereqs if not already enabled
|
# Enable prereqs if not already enabled
|
||||||
if test "x$ENABLED_DTLS" = "xno"
|
if test "x$ENABLED_DTLS" = "xno"
|
||||||
@@ -6037,6 +6037,13 @@ then
|
|||||||
ENABLED_CERTGEN="yes"
|
ENABLED_CERTGEN="yes"
|
||||||
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_GEN"
|
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_GEN"
|
||||||
fi
|
fi
|
||||||
|
# wolfCrypt JNI/JCE uses keygen, enable by default here so
|
||||||
|
# both JCE and JSSE builds can use --enable-jni
|
||||||
|
if test "x$ENABLED_KEYGEN" = "xno"
|
||||||
|
then
|
||||||
|
ENABLED_KEYGEN="yes"
|
||||||
|
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_KEY_GEN"
|
||||||
|
fi
|
||||||
if test "x$ENABLED_CERTREQ" = "xno"
|
if test "x$ENABLED_CERTREQ" = "xno"
|
||||||
then
|
then
|
||||||
ENABLED_CERTREQ="yes"
|
ENABLED_CERTREQ="yes"
|
||||||
@@ -6052,6 +6059,11 @@ then
|
|||||||
ENABLED_ALPN="yes"
|
ENABLED_ALPN="yes"
|
||||||
AM_CFLAGS="$AM_CFLAGS -DHAVE_ALPN"
|
AM_CFLAGS="$AM_CFLAGS -DHAVE_ALPN"
|
||||||
fi
|
fi
|
||||||
|
if test "x$ENABLED_ALT_CERT_CHAINS" = "xno"
|
||||||
|
then
|
||||||
|
ENABLED_ALT_CERT_CHAINS="yes"
|
||||||
|
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ALT_CERT_CHAINS"
|
||||||
|
fi
|
||||||
|
|
||||||
# cert gen requires alt names
|
# cert gen requires alt names
|
||||||
ENABLED_ALTNAMES="yes"
|
ENABLED_ALTNAMES="yes"
|
||||||
|
Reference in New Issue
Block a user