summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--scp2/source/extensions/module_extensions.scp14
-rw-r--r--scp2/source/extensions/module_extensions.ulf6
-rw-r--r--setup_native/source/packinfo/packinfo_extensions.txt15
4 files changed, 0 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac
index 70c0c11a1baf..e865649034c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8131,9 +8131,6 @@ AC_SUBST(MARIADBC_MINOR)
AC_SUBST(MARIADBC_MICRO)
if test "$ENABLE_MARIADBC" = "TRUE"; then
-
- SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MARIADBC"
-
dnl ===================================================================
dnl Check for system MariaDB
dnl ===================================================================
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 6db143fce8bc..7c14cfeda594 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -105,20 +105,6 @@ Module gid_Module_Optional_Extensions_LanguageTool
End
#endif
-/* ** MySQL Connector ** */
-
-#ifdef WITH_EXTENSION_MARIADBC
-Module gid_Module_Optional_Extensions_MySQLConnector
- PackageInfo = "packinfo_extensions.txt";
- MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MARIADBC);
- ParentID = gid_Module_Optional_Extensions;
- Files = (
- gid_File_Oxt_MySQLConnector );
- Default = YES;
- Styles = ( );
-End
-#endif
-
/* ** Script provider for BeanShell ** */
#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
index 02de867b4ac8..a5fb2238fabb 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -52,12 +52,6 @@ en-US = "LanguageTool Open Source language checker"
[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL]
en-US = "LanguageTool Open Source language checker"
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MARIADBC]
-en-US = "MySQL Connector"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MARIADBC]
-en-US = "MySQL Connector"
-
[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
en-US = "Script provider for BeanShell"
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt
index f08fdfc197d6..6b2cf0612e52 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -110,21 +110,6 @@ packageversion = "%PACKAGEVERSION"
End
Start
-module = "gid_Module_Optional_Extensions_MySQLConnector"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-mysql-connector"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-mysql-connector"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
-linuxpatchrequires = ""
-copyright = "2017 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "MySQL Connector extension for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
module = "gid_Module_Optional_Extensions_Script_Provider_For_BS"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-beanshell-script-provider"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"