wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3203 from tmael/libwebsockets

Browse Source 
Enable HAVE_EX_DATA for libwebsockets
This commit is contained in:
David Garske
2020-08-08 14:34:18 -07:00
committed by GitHub
parent c0a664a8e5 6379ca8e10
commit b25eccb07e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -120,7 +120,7 @@ AS_CASE([$ENABLED_FIPS],
ENABLED_FIPS="yes" ENABLED_FIPS="yes"
FIPS_VERSION="v1" FIPS_VERSION="v1"
]) ])
# Distro build feature subset (Debian, Ubuntu, etc.) # Distro build feature subset (Debian, Ubuntu, etc.)
AC_ARG_ENABLE([distro], AC_ARG_ENABLE([distro],
@ -491,7 +491,7 @@ AC_ARG_ENABLE([libwebsockets],
) )
if test "$ENABLED_LIBWEBSOCKETS" = "yes" if test "$ENABLED_LIBWEBSOCKETS" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_LIBWEBSOCKETS -DOPENSSL_NO_EC" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_LIBWEBSOCKETS -DHAVE_EX_DATA -DOPENSSL_NO_EC"
fi fi
@ -4191,7 +4191,7 @@ AC_ARG_WITH([octeon-sync],
AM_CFLAGS="$AM_CFLAGS -I$OCTEON_ROOT/executive" AM_CFLAGS="$AM_CFLAGS -I$OCTEON_ROOT/executive"
AS_CASE([$OCTEON_HOST],['linux'],[AM_CFLAGS="$AM_CFLAGS -DCVMX_BUILD_FOR_LINUX_HOST"]) AS_CASE([$OCTEON_HOST],['linux'],[AM_CFLAGS="$AM_CFLAGS -DCVMX_BUILD_FOR_LINUX_HOST"])
#-I$OCTEON_ROOT/target/include #-I$OCTEON_ROOT/target/include
AM_LDFLAGS="$AM_LDFLAGS -lrt -Xlinker -T -Xlinker $OCTEON_ROOT/executive/cvmx-shared-linux.ld" AM_LDFLAGS="$AM_LDFLAGS -lrt -Xlinker -T -Xlinker $OCTEON_ROOT/executive/cvmx-shared-linux.ld"
AM_LDFLAGS="$AM_LDFLAGS -L$OCTEON_ROOT/executive/$OCTEON_OBJ -lcvmx -lfdt" AM_LDFLAGS="$AM_LDFLAGS -L$OCTEON_ROOT/executive/$OCTEON_OBJ -lcvmx -lfdt"