Skip to content

Fix include/lib path ordering so wolfSSL paths take precedence #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ColtonWilley wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix include/lib path ordering so wolfSSL paths take precedence #372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,20 @@ USER_CFLAGS="$CFLAGS"
AC_PROG_CC
AC_LANG(C)

# OpenSSL
AC_CHECK_HEADERS([openssl/core.h])
# wolfSSL - check first so its -I/-L paths take precedence over OpenSSL prefix
# which may contain stale wolfSSL headers from a different version
AX_CHECK_WOLFSSL(
[have_wolfssl=yes],
AC_MSG_FAILURE([could not locate wolfSSL])
)

if test "x$have_wolfssl" = "xyes"; then
LIBS="$LIBS $WOLFSSL_LIBS"
CFLAGS="$CFLAGS $WOLFSSL_INCLUDES"
LDFLAGS="$LDFLAGS $WOLFSSL_LDFLAGS"
fi

# OpenSSL
AX_CHECK_OPENSSL(
[have_openssl=yes],
AC_MSG_FAILURE([could not locate OpenSSL])
Expand All @@ -40,17 +51,7 @@ if test "x$have_openssl" = "xyes"; then
LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
fi

# wolfSSL
AX_CHECK_WOLFSSL(
[have_wolfssl=yes],
AC_MSG_FAILURE([could not locate wolfSSL])
)

if test "x$have_wolfssl" = "xyes"; then
LIBS="$LIBS $WOLFSSL_LIBS"
CFLAGS="$CFLAGS $WOLFSSL_INCLUDES"
LDFLAGS="$LDFLAGS $WOLFSSL_LDFLAGS"
fi
AC_CHECK_HEADERS([openssl/core.h])

# Check for required headers
AC_CHECK_HEADERS([stdlib.h])
Expand Down
Loading