configure.ac | 4 ----
ios/config.h.in | 3 ---
2 files changed, 7 deletions(-)
New commits:
commit f0350a6fa18d560381431b8ca3393a3373313d65
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Jul 23 15:45:32 2020 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Jul 23 16:42:36 2020 +0200
We don't check ENABLE_SETCAP in any source so no need to AC_DEFINE it
AC_DEFINE causes it to be in config.h, but there is no code that would
use its definition from there.
It is enough to have AM_CONDITIONAL for it (to enable having 'if
ENABLE_SETCAP' in Makefile.am files) and AC_SUBST it (to enable having
'@ENABLE_SETCAP@' in Makefile.am and *.in files).
Change-Id: Ia00b624114c8139d81bb173c92800ae0a62fec35
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99287
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/configure.ac b/configure.ac
index c678540db..dfc3da14c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1070,10 +1070,6 @@ AC_SUBST(LOOLWSD_CONFIGDIR)
LOOLWSD_DATADIR=${datadir}/${PACKAGE}
AC_SUBST(LOOLWSD_DATADIR)
-AS_IF([test "$enable_setcap" != "no"],
- [AC_DEFINE([ENABLE_SETCAP],1,[Whether to enable setting of
capabilities])],
- [AC_DEFINE([ENABLE_SETCAP],0,[Whether to enable setting of
capabilities])])
-
AM_CONDITIONAL([ENABLE_SETCAP], [test "$enable_setcap" != "no"])
ENABLE_SETCAP=
diff --git a/ios/config.h.in b/ios/config.h.in
index 3224d2090..9cc7565eb 100644
--- a/ios/config.h.in
+++ b/ios/config.h.in
@@ -13,9 +13,6 @@
security pieces */
#define ENABLE_DEBUG 0
-/* Whether to enable setting of capabilities */
-#define ENABLE_SETCAP 0
-
/* Whether to enable SSL */
#define ENABLE_SSL 0
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
