From c16866875df5e08a8b080053a2a2b73e4ff2d8f7 Mon Sep 17 00:00:00 2001 From: vemax78 Date: Mon, 27 May 2013 21:30:57 +0200 Subject: [PATCH] Set to use openssl devel version --- build/ac/Makefile.am | 1 + build/wtp/Makefile.am | 1 + configure.ac | 17 +++++++++-------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build/ac/Makefile.am b/build/ac/Makefile.am index c3cfc7c..90f8d52 100755 --- a/build/ac/Makefile.am +++ b/build/ac/Makefile.am @@ -62,3 +62,4 @@ ac_LDADD = \ if DTLS_ENABLED ac_LDADD += $(SSL_LIBS) endif + diff --git a/build/wtp/Makefile.am b/build/wtp/Makefile.am index 3419468..fc5a140 100755 --- a/build/wtp/Makefile.am +++ b/build/wtp/Makefile.am @@ -68,3 +68,4 @@ if BUILD_WTP_WIFI_DRIVERS_NL80211 wtp_SOURCES += $(top_srcdir)/src/binding/wifi/drivers/wifi_nl80211.c wtp_LDADD += $(LIBNL_LIBS) endif + diff --git a/configure.ac b/configure.ac index e7e9317..c051420 100644 --- a/configure.ac +++ b/configure.ac @@ -191,15 +191,16 @@ if test "${with_ssl_library}" = "openssl"; then ) if test "${have_openssl_ssl}" = "yes"; then - saved_CFLAGS="${CFLAGS}" - saved_LIBS="${LIBS}" - CFLAGS="${CFLAGS} ${OPENSSL_SSL_CFLAGS}" - LIBS="${LIBS} ${OPENSSL_SSL_LIBS}" have_openssl_engine="yes" - AC_CHECK_FUNC([SSL_CTX_set_cookie_generate_cb], , [AC_MSG_ERROR([${with_ssl_library} SSL_CTX_set_cookie_generate_cb function is required but missing])]) - AC_CHECK_FUNC([SSL_CTX_set_cookie_verify_cb], , [AC_MSG_ERROR([${with_ssl_library} SSL_CTX_set_cookie_verify_cb function is required but missing])]) - CFLAGS="${saved_CFLAGS}" - LIBS="${saved_LIBS}" + OPENSSL_SSL_LIBS="${OPENSSL_SSL_LIBS} -ldl" + #saved_CFLAGS="${CFLAGS}" + #saved_LIBS="${LIBS}" + #CFLAGS="${CFLAGS} ${OPENSSL_SSL_CFLAGS}" + #LIBS="${LIBS} ${OPENSSL_SSL_LIBS}" + #AC_CHECK_FUNC([SSL_CTX_set_cookie_generate_cb], , [AC_MSG_ERROR([${with_ssl_library} SSL_CTX_set_cookie_generate_cb function is required but missing])]) + #AC_CHECK_FUNC([SSL_CTX_set_cookie_verify_cb], , [AC_MSG_ERROR([${with_ssl_library} SSL_CTX_set_cookie_verify_cb function is required but missing])]) + #CFLAGS="${saved_CFLAGS}" + #LIBS="${saved_LIBS}" fi elif test "${with_ssl_library}" = "cyassl"; then AC_CHECK_HEADER([cyassl/ssl.h], [], [AC_MSG_ERROR(You need the cyassl headers)])