mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

fixed building from source tith openssl

Browse Source
This commit is contained in:
Razvan Becheriu
2019-03-05 18:18:30 +02:00
committed by Razvan Becheriu
parent 988f0a7ca6
commit 1fa2f5fc92
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -605,8 +605,11 @@ AC_ARG_WITH([gtest],
[specify a path to gtest header files (PATH/include) and library (PATH/lib)])], [specify a path to gtest header files (PATH/include) and library (PATH/lib)])],
[gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"]) [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"])
AC_ARG_WITH(lcov, AC_ARG_WITH([lcov],
[ --with-lcov[=PROGRAM] enable gtest and coverage target using the specified lcov], lcov="$withval", lcov="no") [AS_HELP_STRING([--with-lcov=PROGRAM],
[enable gtest and coverage target using the specified lcov])],
[lcov="$withval"],
[lcov="no"])
USE_LCOV="no" USE_LCOV="no"
if test "$lcov" != "no"; then if test "$lcov" != "no"; then

10
m4macros/ax_crypto.m4
View File

@@ -408,7 +408,7 @@ else
if test "${use_openssl}" = "/usr" ; then if test "${use_openssl}" = "/usr" ; then
CRYPTO_CFLAGS="" CRYPTO_CFLAGS=""
CRYPTO_INCLUDES="" CRYPTO_INCLUDES=""
CRYPTO_LIBS="-lcrypto" CRYPTO_LIBS="-lcrypto -lssl"
DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl" DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl"
else else
CRYPTO_CFLAGS="" CRYPTO_CFLAGS=""
@@ -416,20 +416,20 @@ else
DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl=${use_openssl}" DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl=${use_openssl}"
case $host in case $host in
*-solaris*) *-solaris*)
CRYPTO_LIBS="-L${use_openssl}/lib -R${use_openssl}/lib -lcrypto" CRYPTO_LIBS="-L${use_openssl}/lib -R${use_openssl}/lib -lcrypto -lssl"
;; ;;
*-hp-hpux*) *-hp-hpux*)
CRYPTO_LIBS="-L${use_openssl}/lib -Wl,+b: -lcrypto" CRYPTO_LIBS="-L${use_openssl}/lib -Wl,+b: -lcrypto -lssl"
;; ;;
*-apple-darwin*) *-apple-darwin*)
if test -f "${use_openssl}/lib/libcrypto.dylib" ; then if test -f "${use_openssl}/lib/libcrypto.dylib" ; then
CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto" CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto -lssl"
else else
CRYPTO_LIBS="${use_openssl}/lib/libcrypto.a" CRYPTO_LIBS="${use_openssl}/lib/libcrypto.a"
fi fi
;; ;;
*) *)
CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto" CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto -lssl"
;; ;;
esac esac
fi fi