diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-14 13:30:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-15 10:59:56 +0200 |
| commit | 871d75e9c2c82d4b3ffbbff80f1dfa7a823e4f3d (patch) | |
| tree | ba997ca727e6eccaea4b1877f2b4b1f682facaba /mysqlc | |
| parent | 0bb764854361249c60ea31c5366a91dcd938c747 (diff) | |
consistent naming of externals: libmariadb -> mariadb-connector-c
The used version is actually named mariadb_client but since 2.1.0
upstream calls it MariaDB Connector/C.
Change-Id: I51b12a9be55151919585dec91a5fc802ff4fc86b
Reviewed-on: https://gerrit.libreoffice.org/42295
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/Extension_mysql-connector-ooo.mk | 2 | ||||
| -rw-r--r-- | mysqlc/Library_mysqlc.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk index f6ce30a6b395..1cb6fcf2337e 100644 --- a/mysqlc/Extension_mysql-connector-ooo.mk +++ b/mysqlc/Extension_mysql-connector-ooo.mk @@ -26,7 +26,7 @@ ifeq ($(SYSTEM_MYSQL_CPPCONN),) $(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn)) endif -ifneq ($(BUNDLE_MARIADB),) +ifneq ($(BUNDLE_MARIADB_CONNECTOR_C),) $(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\ $(LIBMARIADB_PATH)/$(LIBMARIADB) \ )) diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk index adb2111d690a..0cccc57c7380 100644 --- a/mysqlc/Library_mysqlc.mk +++ b/mysqlc/Library_mysqlc.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_add_defs,mysqlc,\ -DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \ $(if $(SYSTEM_MYSQL_CPPCONN),,\ -DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \ - $(if $(BUNDLE_MARIADB),-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \ + $(if $(BUNDLE_MARIADB_CONNECTOR_C),-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \ )) $(eval $(call gb_Library_add_exception_objects,mysqlc,\ |