Merge pull request #514 from proski/dlopen

Find openssl by pkg-config, add -ldl if needed
master
Itamar Reis Peixoto 8 years ago committed by GitHub
commit 24541396a5

@ -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,6 +52,6 @@ libcommon_la_SOURCES = \
$(PIXMAN_SOURCES) $(PIXMAN_SOURCES)
libcommon_la_LIBADD = \ libcommon_la_LIBADD = \
-lcrypto \ -lpthread \
-lssl \ $(OPENSSL_LIBS) \
-lpthread $(DLOPEN_LIBS)

@ -118,10 +118,15 @@ AC_ARG_ENABLE(pixman, AS_HELP_STRING([--enable-pixman],
[], [enable_pixman=no]) [], [enable_pixman=no])
AM_CONDITIONAL(XRDP_PIXMAN, [test x$enable_pixman = xyes]) AM_CONDITIONAL(XRDP_PIXMAN, [test x$enable_pixman = xyes])
# Check if -ldl is needed to use dlopen()
DLOPEN_LIBS=
AC_CHECK_FUNC(dlopen, [],
[AC_CHECK_LIB(dl, dlopen, [DLOPEN_LIBS=-ldl])])
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

Loading…
Cancel
Save