Kaydet (Commit) 51e92859 authored tarafından Rene Engelhard's avatar Rene Engelhard

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

... and move HAVE_FEATURE_EXTENSIONS there, too

Change-Id: I37fe52071e1db32cf5cc1e51dbd89bb4f32a39c1
Reviewed-on: https://gerrit.libreoffice.org/54072Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarRene Engelhard <rene@debian.org>
üst 5c2c5ff0
......@@ -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>
......
#ifndef CONFIG_EXTENSION_UPDATE
#define CONFIG_EXTENSION_UPDATE
#define ENABLE_EXTENSION_UPDATE 0
#endif
#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
......@@ -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
......
......@@ -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])
......
......@@ -21,6 +21,7 @@
#include <config_features.h>
#include <config_java.h>
#include <config_folders.h>
#include <config_extensions.h>
#include <sal/config.h>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment