This is an automated email from the ASF dual-hosted git repository. ardovm pushed a commit to branch catalina in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 0986a24c272c007505815565adb1f85383d1cf2f Author: Arrigo Marchiori <[email protected]> AuthorDate: Sat Jul 17 14:54:37 2021 +0200 Rely on pkg-config for openssl on macOS too --- ext_libraries/serf/makefile.mk | 5 +---- main/configure.ac | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ext_libraries/serf/makefile.mk b/ext_libraries/serf/makefile.mk index d3f7c55..98388e0 100644 --- a/ext_libraries/serf/makefile.mk +++ b/ext_libraries/serf/makefile.mk @@ -85,17 +85,14 @@ CDEFS+=-DENABLE_SERF_VERBOSE -DSERF_VERBOSE CONFIGURE_DIR= CONFIGURE_ACTION=autoconf && .$/configure -.IF "$(OS)"=="LINUX" +.IF "$(OS)"=="MACOSX" || "$(OS)"=="LINUX" .IF "$(SYSTEM_OPENSSL)"=="YES" CDEFS+=$(OPENSSL_CFLAGS) .ELSE OPENSSLINCDIR=external CDEFS+=-I$(SOLARINCDIR)$/$(OPENSSLINCDIR) .ENDIF -.ENDIF - # On Linux/Mac we need the content of CDEFS in CFLAGS so that the ssl headers are searched for -.IF "$(OS)"=="MACOSX" || "$(OS)"=="LINUX" # in a directory that corresponds to the directory that is searched for the ssl library. CONFIGURE_FLAGS='CFLAGS=$(CDEFS)' .ENDIF diff --git a/main/configure.ac b/main/configure.ac index 57129a0..679a842 100644 --- a/main/configure.ac +++ b/main/configure.ac @@ -5018,9 +5018,7 @@ 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
