From c6307aa2b037359c75659758f4c4e3af666de6ae Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 29 Nov 2016 17:00:09 -0800 Subject: [PATCH] Use pkg-config to discover OpenSSL All supported versions of OpenSSL have pkg-config files. --- common/Makefile.am | 5 +++-- configure.ac | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 049e8af9..1bc5851f 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -18,6 +18,8 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_LOG_PATH=\"${localstatedir}/log\" +AM_CFLAGS = $(OPENSSL_CFLAGS) + module_LTLIBRARIES = \ libcommon.la @@ -50,7 +52,6 @@ libcommon_la_SOURCES = \ $(PIXMAN_SOURCES) libcommon_la_LIBADD = \ - -lcrypto \ - -lssl \ -lpthread \ + $(OPENSSL_LIBS) \ $(DLOPEN_LIBS) diff --git a/configure.ac b/configure.ac index 10f73617..3b58f2de 100644 --- a/configure.ac +++ b/configure.ac @@ -125,9 +125,8 @@ AC_CHECK_FUNC(dlopen, [], AC_SUBST(DLOPEN_LIBS) # checking for openssl -AC_CHECK_HEADER([openssl/rc4.h], [], - [AC_MSG_ERROR([please install libssl-dev or openssl-devel])], - [#include ]) +PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [], + [AC_MSG_ERROR([please install libssl-dev or openssl-devel])]) # checking for pam variation # Linux-PAM is used in Linux systems