RepositoryExternal.mk | 34 -------------
config_host.mk.in | 4 -
configure.ac | 27 +---------
m4/libgcrypt.m4 | 123 --------------------------------------------------
4 files changed, 4 insertions(+), 184 deletions(-)
New commits:
commit df9cbdd22658131b881e6527467c8e2a2dd36c70
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jan 5 08:20:16 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 5 17:50:41 2022 +0100
Drop remnants of --with-webdav=neon
...that were left behind by 023ebf17898db4bca63129f079fd90b5cf76c1a9 "ucb:
remove --with-webdav=neon"
Change-Id: I617ca74d1c4b46d8f0b9dac317b5972bfb911813
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127986
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e791935b2cda..7feb93cc150d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1520,40 +1520,6 @@ endif # SYSTEM_OPENSSL
endif # ENABLE_OPENSSL
-ifneq ($(ENABLE_OPENSSL),TRUE)
-
-define gb_LinkTarget__use_gnutls
-$(call gb_LinkTarget_set_include,$(1),\
- $$(INCLUDE) \
- $(GNUTLS_CFLAGS) \
-)
-
-$(call gb_LinkTarget_add_defs,$(1),\
- -DDISABLE_OPENSSL \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),$(GNUTLS_LIBS))
-
-endef
-
-define gb_LinkTarget__use_libgcrypt
-$(call gb_LinkTarget_set_include,$(1),\
- $$(INCLUDE) \
- $(LIBGCRYPT_CFLAGS) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),$(LIBGCRYPT_LIBS))
-
-endef
-
-else # ENABLE_OPENSSL
-
-gb_LinkTarget__use_gnutls:=
-gb_LinkTarget__use_libgcrypt:=
-
-endif # ENABLE_OPENSSL
-
-
ifneq ($(SYSTEM_CDR),)
define gb_LinkTarget__use_cdr
diff --git a/config_host.mk.in b/config_host.mk.in
index 578926500b48..6d2102dd47e6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -244,8 +244,6 @@ export GPG_ERROR_CFLAGS=$(gb_SPACE)@GPG_ERROR_CFLAGS@
export GPG_ERROR_LIBS=$(gb_SPACE)@GPG_ERROR_LIBS@
export GPGMEPP_CFLAGS=$(gb_SPACE)@GPGMEPP_CFLAGS@
export GPGMEPP_LIBS=$(gb_SPACE)@GPGMEPP_LIBS@
-export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@
-export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@
export PARALLELISM?=@PARALLELISM@
@x_GNUCP@ export GNUCOPY=@GNUCP@
export GNUPATCH=@GNUPATCH@
@@ -357,8 +355,6 @@ export
LIBEXTTEXTCAT_CFLAGS=$(gb_SPACE)@LIBEXTTEXTCAT_CFLAGS@
export LIBEXTTEXTCAT_LIBS=$(gb_SPACE)@LIBEXTTEXTCAT_LIBS@
export LIBFONTS_JAR=@LIBFONTS_JAR@
export LIBFORMULA_JAR=@LIBFORMULA_JAR@
-export LIBGCRYPT_CFLAGS=@LIBGCRYPT_CFLAGS@
-export LIBGCRYPT_LIBS=@LIBGCRYPT_LIBS@
export LIBJPEG_CFLAGS=$(gb_SPACE)@LIBJPEG_CFLAGS@
export LIBJPEG_LIBS=$(gb_SPACE)@LIBJPEG_LIBS@
export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 9b5fbda9e868..a7c23de74122 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1904,7 +1904,7 @@ AC_ARG_ENABLE(bogus-pkg-config,
AC_ARG_ENABLE(openssl,
AS_HELP_STRING([--disable-openssl],
[Disable using libssl/libcrypto from OpenSSL. If disabled,
- components will either use GNUTLS or NSS. Work in progress,
+ components will use NSS. Work in progress,
use only if you are hacking on it.]),
,enable_openssl=yes)
@@ -1916,7 +1916,7 @@ libo_FUZZ_ARG_ENABLE(cipher-openssl-backend,
AC_ARG_ENABLE(nss,
AS_HELP_STRING([--disable-nss],
[Disable using NSS. If disabled,
- components will either use GNUTLS or openssl. Work in progress,
+ components will use openssl. Work in progress,
use only if you are hacking on it.]),
,enable_nss=yes)
@@ -10486,8 +10486,8 @@ if test -n "$with_tls"; then
fi
# warn that OpenSSL has been selected but not all TLS code has this
option
- AC_MSG_WARN([TLS/SSL implementation to use is OpenSSL but some code
may still depend on NSS or GNUTLS])
- add_warning "TLS/SSL implementation to use is OpenSSL but some code
may still depend on NSS or GNUTLS"
+ AC_MSG_WARN([TLS/SSL implementation to use is OpenSSL but some code
may still depend on NSS])
+ add_warning "TLS/SSL implementation to use is OpenSSL but some code
may still depend on NSS"
;;
nss)
AC_DEFINE(USE_TLS_NSS)
@@ -10948,25 +10948,6 @@ if test "$build_crypto" = yes; then
fi
fi
-dnl ===================================================================
-dnl Check for building gnutls
-dnl ===================================================================
-AC_MSG_CHECKING([whether to use gnutls])
-if test "$WITH_WEBDAV" = "neon" -a "$with_system_neon" = no -a
"$enable_openssl" = "no"; then
- AC_MSG_RESULT([yes])
- AM_PATH_LIBGCRYPT()
- PKG_CHECK_MODULES(GNUTLS, [gnutls],,
- AC_MSG_ERROR([[Disabling OpenSSL was requested, but GNUTLS is not
- available in the system to use as replacement.]]))
- FilterLibs "${LIBGCRYPT_LIBS}"
- LIBGCRYPT_LIBS="${filteredlibs}"
-else
- AC_MSG_RESULT([no])
-fi
-
-AC_SUBST([LIBGCRYPT_CFLAGS])
-AC_SUBST([LIBGCRYPT_LIBS])
-
dnl ===================================================================
dnl Check for system redland
dnl ===================================================================
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
deleted file mode 100644
index bf3c59862e42..000000000000
--- a/m4/libgcrypt.m4
+++ /dev/null
@@ -1,123 +0,0 @@
-dnl Autoconf macros for libgcrypt
-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-dnl
-dnl This file is free software; as a special exception the author gives
-dnl unlimited permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-dnl This file is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-
-dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-dnl MINIMUM-VERSION is a string with the version number optionally prefixed
-dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
-dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
-dnl this features allows to prevent build against newer versions of libgcrypt
-dnl with a changed API.
-dnl
-AC_DEFUN([AM_PATH_LIBGCRYPT],
-[ AC_ARG_WITH(libgcrypt-prefix,
- AS_HELP_STRING([--with-libgcrypt-prefix=PFX],
- [prefix where LIBGCRYPT is installed (optional)]),
- libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
- if test x$libgcrypt_config_prefix != x ; then
- if test x${LIBGCRYPT_CONFIG+set} != xset ; then
- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
- fi
- fi
-
- AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
- tmp=ifelse([$1], ,1:1.2.0,$1)
- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
- req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
- min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
- else
- req_libgcrypt_api=0
- min_libgcrypt_version="$tmp"
- fi
-
- AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
- ok=no
- if test "$LIBGCRYPT_CONFIG" != "no" ; then
- req_major=`echo $min_libgcrypt_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
- req_minor=`echo $min_libgcrypt_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
- req_micro=`echo $min_libgcrypt_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
- major=`echo $libgcrypt_config_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
- minor=`echo $libgcrypt_config_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
- micro=`echo $libgcrypt_config_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
- if test "$major" -gt "$req_major"; then
- ok=yes
- else
- if test "$major" -eq "$req_major"; then
- if test "$minor" -gt "$req_minor"; then
- ok=yes
- else
- if test "$minor" -eq "$req_minor"; then
- if test "$micro" -ge "$req_micro"; then
- ok=yes
- fi
- fi
- fi
- fi
- fi
- fi
- if test $ok = yes; then
- AC_MSG_RESULT([yes ($libgcrypt_config_version)])
- else
- AC_MSG_RESULT(no)
- fi
- if test $ok = yes; then
- # If we have a recent libgcrypt, we should also check that the
- # API is compatible
- if test "$req_libgcrypt_api" -gt 0 ; then
- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
- if test "$tmp" -gt 0 ; then
- AC_MSG_CHECKING([LIBGCRYPT API version])
- if test "$req_libgcrypt_api" -eq "$tmp" ; then
- AC_MSG_RESULT([okay])
- else
- ok=no
- AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
- fi
- fi
- fi
- fi
- if test $ok = yes; then
- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
- ifelse([$2], , :, [$2])
- if test x"$host" != x ; then
- libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
- if test x"$libgcrypt_config_host" != xnone ; then
- if test x"$libgcrypt_config_host" != x"$host" ; then
- AC_MSG_WARN([[
-***
-*** The config script $LIBGCRYPT_CONFIG was
-*** built for $libgcrypt_config_host and thus may not match the
-*** used host $host.
-*** You may want to use the configure option --with-libgcrypt-prefix
-*** to specify a matching config script.
-***]])
- fi
- fi
- fi
- else
- LIBGCRYPT_CFLAGS=""
- LIBGCRYPT_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(LIBGCRYPT_CFLAGS)
- AC_SUBST(LIBGCRYPT_LIBS)
-])
