mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 06:10:30 -04:00
* 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
40 lines
1.3 KiB
Text
40 lines
1.3 KiB
Text
--- configure.ac.orig 2017-07-14 12:22:02 UTC
|
|
+++ configure.ac
|
|
@@ -152,11 +152,35 @@ AC_CHECK_FUNC(dlopen, [],
|
|
AC_SUBST(DLOPEN_LIBS)
|
|
|
|
# checking for openssl
|
|
-PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [],
|
|
+if test "x$freebsd" = "xyes"; then
|
|
+ # 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])])
|
|
+ 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
|