diff options
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | mysqlc/Module_mysqlc.mk | 2 | ||||
| -rw-r--r-- | scp2/source/extensions/directory_extensions.scp | 2 | ||||
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 2 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.scp | 4 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.ulf | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index cf5447997363..273385b68382 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -140,7 +140,7 @@ export ENABLE_LTO=@ENABLE_LTO@ export ENABLE_MACOSX_SANDBOX=@ENABLE_MACOSX_SANDBOX@ export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@ export ENABLE_MINIMIZER=@ENABLE_MINIMIZER@ -export ENABLE_MYSQLC=@ENABLE_MYSQLC@ +export ENABLE_MARIADBC=@ENABLE_MARIADBC@ export ENABLE_NPAPI_FROM_BROWSER=@ENABLE_NPAPI_FROM_BROWSER@ export ENABLE_NPAPI_INTO_BROWSER=@ENABLE_NPAPI_INTO_BROWSER@ export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@ diff --git a/mysqlc/Module_mysqlc.mk b/mysqlc/Module_mysqlc.mk index 6a605beaea60..70629a1b7691 100644 --- a/mysqlc/Module_mysqlc.mk +++ b/mysqlc/Module_mysqlc.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,mysqlc)) -ifeq ($(ENABLE_MYSQLC),YES) +ifeq ($(ENABLE_MARIADBC),YES) $(eval $(call gb_Module_add_targets,mysqlc,\ Configuration_mysql \ diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index 32787a8ab2a3..0b7055231f5c 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -189,7 +189,7 @@ End /* ** MySQL Connector ** */ -#ifdef WITH_EXTENSION_MYSQLC +#ifdef WITH_EXTENSION_MARIADBC Directory gid_Brand_Dir_Share_Extensions_MySQLConnector ParentID = gid_Brand_Dir_Share_Extensions; diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 5f9b41073383..f68b539aed66 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -217,7 +217,7 @@ End /* ** MySQL Connector ** */ -#ifdef WITH_EXTENSION_MYSQLC +#ifdef WITH_EXTENSION_MARIADBC File gid_File_Oxt_MySQLConnector TXT_FILE_BODY; diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 84fac6bafa28..319b69b70278 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -254,10 +254,10 @@ End /* ** MySQL Connector ** */ -#ifdef WITH_EXTENSION_MYSQLC +#ifdef WITH_EXTENSION_MARIADBC Module gid_Module_Optional_Extensions_MySQLConnector PackageInfo = "packinfo_extensions.txt"; - MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MYSQLC); + MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MARIADBC); ParentID = gid_Module_Optional_Extensions; Files = ( gid_File_Oxt_MySQLConnector ); diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf index 61618c03d457..50466f5d3bca 100644 --- a/scp2/source/extensions/module_extensions.ulf +++ b/scp2/source/extensions/module_extensions.ulf @@ -117,10 +117,10 @@ 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_MYSQLC] +[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MARIADBC] en-US = "MySQL Connector" -[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MYSQLC] +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MARIADBC] en-US = "MySQL Connector" [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK] |