diff options
| author | Richard Gallamore <ultima@FreeBSD.org> | 2017-08-10 18:31:34 +0000 |
|---|---|---|
| committer | Richard Gallamore <ultima@FreeBSD.org> | 2017-08-10 18:31:34 +0000 |
| commit | a2b665648b8d4d1d7cf66b0fdc684fa2b4ad7dab (patch) | |
| tree | 842fdbb029726639db046df6bf0865cd6eb6a1de /net/xrdp-devel/files/patch-configure.ac | |
| parent | Update to 2.10.23 (diff) | |
* Updated to 0.9.3
* Cleanup Makefile
* Regenerated patch for portlint
Changes: https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.3Changes: https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.3
PR: 220820
Submitted by: Koichiro IWAO (maintainer)
Reviewed by: lifanov (mentor)
Approved by: lifanov (mentor)
MFH: 2017Q3
Differential Revision: https://reviews.freebsd.org/D11956
Notes
Notes:
svn path=/head/; revision=447713
Diffstat (limited to 'net/xrdp-devel/files/patch-configure.ac')
| -rw-r--r-- | net/xrdp-devel/files/patch-configure.ac | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/net/xrdp-devel/files/patch-configure.ac b/net/xrdp-devel/files/patch-configure.ac index 7d46d6c5062d..fe1670e6d4f0 100644 --- a/net/xrdp-devel/files/patch-configure.ac +++ b/net/xrdp-devel/files/patch-configure.ac @@ -1,22 +1,40 @@ -diff --git configure.ac configure.ac -index 5c73168a..abbf4135 100644 ---- configure.ac +--- configure.ac.orig 2017-07-14 12:22:02 UTC +++ configure.ac -@@ -138,8 +138,15 @@ AC_CHECK_FUNC(dlopen, [], +@@ -152,11 +152,35 @@ AC_CHECK_FUNC(dlopen, [], AC_SUBST(DLOPEN_LIBS) - + # checking for openssl --PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [], -- [AC_MSG_ERROR([please install libssl-dev or openssl-devel])]) +-PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [], +if test "x$freebsd" = "xyes"; then -+ # FreeBSD base doesn't supply "*.pc" -+ AC_CHECK_HEADER([openssl/rc4.h], [], -+ [AC_MSG_ERROR([please install libssl-dev or openssl-devel])], -+ [#include <stdlib.h>]) ++ # FreeBSD may have two OpenSSL, base and port however ++ # base OpenSSL doesn.t have openssl.pc file. ++ PKG_CHECK_MODULES( ++ [OPENSSL], ++ [openssl >= 0], ++ [freebsd_openssl=port], ++ [ ++ AC_CHECK_HEADER( ++ [openssl/rc4.h], ++ [freebsd_openssl=base], ++ [AC_MSG_ERROR([please install libssl-dev or openssl-devel])], ++ [#include <stdlib.h>]) ++ ] ++ ) ++ ++ if test "x$freebsd_openssl" = "xport"; then ++ OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin ++ elif test "x$freebsd_openssl" = "xbase"; then ++ OPENSSL_BIN=/usr/bin ++ fi +else ++ # OpenSSL detection for other OS + 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])]) ++ OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin +fi - + + # look for openssl binary +-OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin + AC_PATH_PROGS([OPENSSL], [openssl], [:], [$OPENSSL_BIN:$PATH]) + # checking for pam variation - # Linux-PAM is used in Linux systems |