WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes for cross-compiling.

pull/397/head
David Garske 2022-03-21 16:24:14 -07:00
parent 17008c635e
commit 6a893c918e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -3,7 +3,7 @@
# All right reserved. # All right reserved.
AC_COPYRIGHT([Copyright (C) 2014-2020 wolfSSL Inc.]) AC_COPYRIGHT([Copyright (C) 2014-2020 wolfSSL Inc.])
AC_INIT([wolfssh],[1.4.8],[support@wolfssl.com],[wolfssh],[https://www.wolfssl.com]) AC_INIT([wolfssh],[1.4.9],[support@wolfssl.com],[wolfssh],[https://www.wolfssl.com])
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
@ -18,7 +18,7 @@ AC_ARG_PROGRAM
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
WOLFSSH_LIBRARY_VERSION=12:3:3 WOLFSSH_LIBRARY_VERSION=12:3:4
# | | | # | | |
# +------+ | +---+ # +------+ | +---+
# | | | # | | |
@ -72,6 +72,9 @@ AC_ARG_WITH(wolfssl,
if test "x$withval" != "xno" ; then if test "x$withval" != "xno" ; then
if test -d "${withval}/lib" && test -d "${withval}/include"; then if test -d "${withval}/lib" && test -d "${withval}/include"; then
wcpath=${withval} wcpath=${withval}
LDFLAGS="$LDFLAGS -L${wcpath}/lib"
CPPFLAGS="$CPPFLAGS -I${wcpath}/include"
else else
AC_MSG_ERROR([wolfSSL path error (${withval}): missing lib and include]) AC_MSG_ERROR([wolfSSL path error (${withval}): missing lib and include])
fi fi
@ -79,9 +82,6 @@ AC_ARG_WITH(wolfssl,
] ]
) )
LDFLAGS="$LDFLAGS -L${wcpath}/lib"
CPPFLAGS="$CPPFLAGS -I${wcpath}/include"
AC_CHECK_LIB([wolfssl],[wolfCrypt_Init],,[AC_MSG_ERROR([libwolfssl is required for ${PACKAGE}. It can be obtained from https://www.wolfssl.com/download.html/ .])]) AC_CHECK_LIB([wolfssl],[wolfCrypt_Init],,[AC_MSG_ERROR([libwolfssl is required for ${PACKAGE}. It can be obtained from https://www.wolfssl.com/download.html/ .])])
AC_CHECK_FUNCS([gethostbyname getaddrinfo gettimeofday inet_ntoa memset socket wc_ecc_set_rng]) AC_CHECK_FUNCS([gethostbyname getaddrinfo gettimeofday inet_ntoa memset socket wc_ecc_set_rng])
AC_CHECK_DECLS([[pread],[pwrite]],,[unistd.h]) AC_CHECK_DECLS([[pread],[pwrite]],,[unistd.h])

4
wolfssh/version.h
View File

@ -35,8 +35,8 @@
extern "C" { extern "C" {
#endif #endif
#define LIBWOLFSSH_VERSION_STRING "1.4.8" #define LIBWOLFSSH_VERSION_STRING "1.4.9"
#define LIBWOLFSSH_VERSION_HEX 0x01004008 #define LIBWOLFSSH_VERSION_HEX 0x01004009
#ifdef __cplusplus #ifdef __cplusplus
} }