mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use pkg-config to discover OpenSSL

Browse Source 
All supported versions of OpenSSL have pkg-config files.
This commit is contained in:
Pavel Roskin 2016-11-29 17:00:09 -08:00
parent 06f4f72e28
commit c6307aa2b0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/Makefile.am
View File

@ -18,6 +18,8 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_LOG_PATH=\"${localstatedir}/log\" -DXRDP_LOG_PATH=\"${localstatedir}/log\"
AM_CFLAGS = $(OPENSSL_CFLAGS)
module_LTLIBRARIES = \ module_LTLIBRARIES = \
libcommon.la libcommon.la
@ -50,7 +52,6 @@ libcommon_la_SOURCES = \
$(PIXMAN_SOURCES) $(PIXMAN_SOURCES)
libcommon_la_LIBADD = \ libcommon_la_LIBADD = \
-lcrypto \
-lssl \
-lpthread \ -lpthread \
$(OPENSSL_LIBS) \
$(DLOPEN_LIBS) $(DLOPEN_LIBS)

5
configure.ac
View File

@ -125,9 +125,8 @@ AC_CHECK_FUNC(dlopen, [],
AC_SUBST(DLOPEN_LIBS) AC_SUBST(DLOPEN_LIBS)
# checking for openssl # checking for openssl
AC_CHECK_HEADER([openssl/rc4.h], [], PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [],
[AC_MSG_ERROR([please install libssl-dev or openssl-devel])], [AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
[#include <stdlib.h>])
# checking for pam variation # checking for pam variation
# Linux-PAM is used in Linux systems # Linux-PAM is used in Linux systems