This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new a7bec80 Merge branch 'AOO42X' of
https://gitbox.apache.org/repos/asf/openoffice into AOO42X
a7bec80 is described below
commit a7bec80d7df13648c5c16455499cf1f247f07db9
Author: Jim Jagielski <[email protected]>
AuthorDate: Mon Dec 21 14:28:50 2020 -0500
Merge branch 'AOO42X' of https://gitbox.apache.org/repos/asf/openoffice
into AOO42X
(cherry picked from commit 01534ec2e58ccf70f7fc287e53228dd5039e2d23)
---
main/configure.ac | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/main/configure.ac b/main/configure.ac
index bcc1325..16d5c14 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -5019,16 +5019,11 @@ AC_SUBST(NSS_LIBS)
dnl ===================================================================
dnl Check for system openssl
dnl ===================================================================
-if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
- with_system_openssl=yes
-fi
AC_MSG_CHECKING([which libssl to use])
if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
test "$with_system_openssl" != "no"; then
AC_MSG_RESULT([external])
- # Mac OS builds should get out without extra stuff is the Mac porters'
- # wish. And pkg-config is although Xcode ships a .pc for openssl
- if test "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ if test "$_os" = "FreeBSD"; then
OPENSSL_CFLAGS=
OPENSSL_LIBS="-lssl -lcrypto"
else
