ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

rename config_extension_update.h.in to config_extensions.h.in

Browse Source 
... and move HAVE_FEATURE_EXTENSIONS there, too

Change-Id: I37fe52071e1db32cf5cc1e51dbd89bb4f32a39c1
Reviewed-on: https://gerrit.libreoffice.org/54072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Rene Engelhard <rene@debian.org>
This commit is contained in:
Rene Engelhard
2018-05-23 11:44:57 +02:00
parent 5c2c5ff01c
commit 51e92859c9
9 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basic/source/uno/namecont.cxx
+1 -1
View File
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include <config_extensions.h>
#include <config_folders.h>
#include <com/sun/star/container/XNameContainer.hpp>
config_host/config_extension_update.h.in
-6
View File
@@ -1,6 +0,0 @@
#ifndef CONFIG_EXTENSION_UPDATE
#define CONFIG_EXTENSION_UPDATE
#define ENABLE_EXTENSION_UPDATE 0
#endif
config_host/config_extensions.h.in
+15
View File
@@ -0,0 +1,15 @@
#ifndef CONFIG_EXTENSION_UPDATE
#define CONFIG_EXTENSION_UPDATE
/* EXTENSIONS - Whether we have any extension mechanism at all
*
* Primarily intended for non-desktop platforms where supporting
* extensions can be complicated, or even prohibited by the OS (as on
* iOS).
*/
#define HAVE_FEATURE_EXTENSIONS 0
#define ENABLE_EXTENSION_UPDATE 0
#endif
config_host/config_features.h.in
-9
View File
@@ -47,15 +47,6 @@
#define HAVE_FEATURE_DBCONNECTIVITY 0
/* EXTENSIONS - Whether we have any extension mechanism at all
*
* Primarily intended for non-desktop platforms where supporting
* extensions can be complicated, or even prohibited by the OS (as on
* iOS).
*/
#define HAVE_FEATURE_EXTENSIONS 0
/* SCRIPTING - Whether we have any mechanism to execute user-provided scripts
*
* Primarily intended for the iOS App Store where the
configure.ac
+1 -1
View File
@@ -12725,7 +12725,7 @@ AC_CONFIG_HEADERS([config_host/config_buildid.h])
AC_CONFIG_HEADERS([config_host/config_clang.h])
AC_CONFIG_HEADERS([config_host/config_dconf.h])
AC_CONFIG_HEADERS([config_host/config_eot.h])
AC_CONFIG_HEADERS([config_host/config_extension_update.h])
AC_CONFIG_HEADERS([config_host/config_extensions.h])
AC_CONFIG_HEADERS([config_host/config_cairo_canvas.h])
AC_CONFIG_HEADERS([config_host/config_cxxabi.h])
AC_CONFIG_HEADERS([config_host/config_dbus.h])
desktop/source/app/app.cxx
+1
View File
@@ -21,6 +21,7 @@
#include <config_features.h>
#include <config_java.h>
#include <config_folders.h>
#include <config_extensions.h>
#include <sal/config.h>
desktop/source/deployment/gui/dp_gui_dialog2.hxx
+1 -1
View File
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX
#include <config_extension_update.h>
#include <config_extensions.h>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
desktop/source/deployment/manager/dp_activepackages.hxx
+1 -1
View File
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_ACTIVEPACKAGES_HXX
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_ACTIVEPACKAGES_HXX
#include <config_features.h>
#include <config_extensions.h>
#include <sal/config.h>
desktop/source/deployment/registry/configuration/dp_configuration.cxx
+1 -1
View File
@@ -20,7 +20,7 @@
//TODO: Large parts of this file were copied from dp_component.cxx; those parts
// should be consolidated.
#include <config_features.h>
#include <config_extensions.h>
#include <dp_backend.h>
#if HAVE_FEATURE_EXTENSIONS