[Libreoffice-commits] core.git: config_host.mk.in mysqlc/Module_mysqlc.mk scp2/source

[Rene Engelhard]

 config_host.mk.in                               |    2 +-
 mysqlc/Module_mysqlc.mk                         |    2 +-
 scp2/source/extensions/directory_extensions.scp |    2 +-
 scp2/source/extensions/file_extensions.scp      |    2 +-
 scp2/source/extensions/module_extensions.scp    |    4 ++--
 scp2/source/extensions/module_extensions.ulf    |    4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ea5909eb57e83946c4beca6cd2234f99f118f18e
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Mar 10 14:09:53 2013 +0100

    adapt config_host.mk.in/scp2/mysqlc to MARIADBC
    
    Change-Id: Id60fc25405a3879e64bd5f2ff637c655ba7dfc78

diff --git a/config_host.mk.in b/config_host.mk.in
index cf54479..273385b 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 6a605be..70629a1 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 32787a8..0b70552 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 5f9b410..f68b539 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 84fac6b..319b69b 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 61618c0..50466f5 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]