diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 16:57:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:09 +0100 |
| commit | 0443d0a90ecb9ac54484c1c2c6b9d74892eb35ae (patch) | |
| tree | 14d96f096ee449348730e9bade2571cb23f46482 /mysqlc | |
| parent | 379f978387a8b017a41c2682c0b39444f17a2230 (diff) | |
normalize values of SYSTEM_PYTHON, SYSTEM_MYSQL_CPPCONN
Change-Id: I8932febdd39c35f23fb3a89703b69e25302f5678
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/Extension_mysql-connector-ooo.mk | 2 | ||||
| -rw-r--r-- | mysqlc/Library_mysqlc.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk index 1ca1f58efd9e..a4a223255fc3 100644 --- a/mysqlc/Extension_mysql-connector-ooo.mk +++ b/mysqlc/Extension_mysql-connector-ooo.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Extension_add_files,mysql-connector-ooo,images,\ $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \ )) -ifeq ($(SYSTEM_MYSQL_CPPCONN),NO) +ifeq ($(SYSTEM_MYSQL_CPPCONN),) $(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn)) endif diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk index 151c49387a1a..01de4e4841ef 100644 --- a/mysqlc/Library_mysqlc.mk +++ b/mysqlc/Library_mysqlc.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Library_use_externals,mysqlc,\ mysqlcppconn \ )) -ifeq ($(SYSTEM_MYSQL_CPPCONN),NO) +ifeq ($(SYSTEM_MYSQL_CPPCONN),) $(eval $(call gb_Library_add_libs,mysqlc,\ $(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz -lm,\ -rdynamic -lz -lcrypt -lnsl -lm)) \ @@ -38,7 +38,7 @@ $(eval $(call gb_Library_add_defs,mysqlc,\ -DMARIADBC_VERSION_MAJOR=$(MARIADBC_MAJOR) \ -DMARIADBC_VERSION_MINOR=$(MARIADBC_MINOR) \ -DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \ - $(if $(filter NO,$(SYSTEM_MYSQL_CPPCONN)),\ + $(if $(SYSTEM_MYSQL_CPPCONN),,\ -DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \ $(if $(filter YES,$(BUNDLE_MARIADB)),\ -DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \ |