config_host/config_features.h.in | 13 -------------
config_host/config_validation.h.in | 14 ++++++++++++++
configure.ac | 1 +
test/source/bootstrapfixture.cxx | 2 +-
4 files changed, 16 insertions(+), 14 deletions(-)
New commits:
commit 2e33af67e04da39116a1dc9fda96d961ae0a4bd5
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Apr 28 18:17:12 2022 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Fri Apr 29 06:55:04 2022 +0200
move HAVE_EXPORT_VALIDATION from config_features.h
So that so much stuff doesn't get rebuilt on --with-java change.
Change-Id: I87388590a4fd218fd22e68ba0edd290831f6f0fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133570
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index de3e9d58f7d2..867258e262db 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -76,19 +76,6 @@
#define HAVE_FEATURE_READONLY_INSTALLSET 0
-/*
- * Whether to use validation on files.
- */
-#define HAVE_EXPORT_VALIDATION 0
-
-/*
- * Whether to use export validation of binary formats (doc, xls, ppt)
- *
- * Requires installed Microsoft Office Binary File Format Validator
- * https://www.microsoft.com/en-us/download/details.aspx?id=26794
- */
-#define HAVE_BFFVALIDATOR 0
-
/*
* Whether we support breakpad as crash reporting lib.
*/
diff --git a/config_host/config_validation.h.in
b/config_host/config_validation.h.in
new file mode 100644
index 000000000000..892dd1262c90
--- /dev/null
+++ b/config_host/config_validation.h.in
@@ -0,0 +1,14 @@
+#pragma once
+
+/*
+ * Whether to use validation on files.
+ */
+#define HAVE_EXPORT_VALIDATION 0
+
+/*
+ * Whether to use export validation of binary formats (doc, xls, ppt)
+ *
+ * Requires installed Microsoft Office Binary File Format Validator
+ * https://www.microsoft.com/en-us/download/details.aspx?id=26794
+ */
+#define HAVE_BFFVALIDATOR 0
diff --git a/configure.ac b/configure.ac
index a43d6bddd344..b40d16003d44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14722,6 +14722,7 @@ AC_CONFIG_HEADERS([config_host/config_options_calc.h])
AC_CONFIG_HEADERS([config_host/config_zxing.h])
AC_CONFIG_HEADERS([config_host/config_skia.h])
AC_CONFIG_HEADERS([config_host/config_typesizes.h])
+AC_CONFIG_HEADERS([config_host/config_validation.h])
AC_CONFIG_HEADERS([config_host/config_vendor.h])
AC_CONFIG_HEADERS([config_host/config_vcl.h])
AC_CONFIG_HEADERS([config_host/config_vclplug.h])
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index c13caf807d1e..be273f0a1955 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <config_features.h>
+#include <config_validation.h>
#include <test/bootstrapfixture.hxx>
#include <vcl/errinf.hxx>
