mirror of https://github.com/wolfSSL/wolfssh.git
Fixes for cross-compiling.
parent
17008c635e
commit
6a893c918e
10
configure.ac
10
configure.ac
|
@ -3,7 +3,7 @@
|
|||
# All right reserved.
|
||||
|
||||
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_CONFIG_AUX_DIR([build-aux])
|
||||
|
||||
|
@ -18,7 +18,7 @@ AC_ARG_PROGRAM
|
|||
AC_CONFIG_MACRO_DIR([m4])
|
||||
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 -d "${withval}/lib" && test -d "${withval}/include"; then
|
||||
wcpath=${withval}
|
||||
|
||||
LDFLAGS="$LDFLAGS -L${wcpath}/lib"
|
||||
CPPFLAGS="$CPPFLAGS -I${wcpath}/include"
|
||||
else
|
||||
AC_MSG_ERROR([wolfSSL path error (${withval}): missing lib and include])
|
||||
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_FUNCS([gethostbyname getaddrinfo gettimeofday inet_ntoa memset socket wc_ecc_set_rng])
|
||||
AC_CHECK_DECLS([[pread],[pwrite]],,[unistd.h])
|
||||
|
|
|
@ -35,8 +35,8 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define LIBWOLFSSH_VERSION_STRING "1.4.8"
|
||||
#define LIBWOLFSSH_VERSION_HEX 0x01004008
|
||||
#define LIBWOLFSSH_VERSION_STRING "1.4.9"
|
||||
#define LIBWOLFSSH_VERSION_HEX 0x01004009
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue