diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 19:11:47 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:10 +0100 |
| commit | 5378deaea3a499003be14f97bd1a9fb3e729a698 (patch) | |
| tree | 8eb57fa5e71c962cb254f0f30cde294dfc06ef0c /RepositoryExternal.mk | |
| parent | ff69e725c218a36d64153b36eb1fecd2b6057803 (diff) | |
normalize values of SYSTEM_ODBC_HEADERS, SYSTEM_OPENLDAP
Change-Id: I913c38878a110625747fbf32ad9c43ad0dab30d3
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3f9577167aa6..ae186b793e6a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -71,7 +71,7 @@ endef endif #SYSTEM_NPAPI_HEADERS -ifeq ($(SYSTEM_ODBC_HEADERS),YES) +ifneq ($(SYSTEM_ODBC_HEADERS),) define gb_LinkTarget__use_odbc_headers $(call gb_LinkTarget_add_defs,$(1),\ @@ -80,7 +80,7 @@ $(call gb_LinkTarget_add_defs,$(1),\ endef -else +else # !SYSTEM_ODBC_HEADERS define gb_LinkTarget__use_odbc_headers $(call gb_LinkTarget_set_include,$(1),\ @@ -90,7 +90,7 @@ $(call gb_LinkTarget_set_include,$(1),\ endef -endif +endif # SYSTEM_ODBC_HEADERS ifneq ($(SYSTEM_VIGRA),) @@ -2255,7 +2255,7 @@ endef endif # SYSTEM_HSQLDB -ifeq ($(SYSTEM_OPENLDAP),YES) +ifneq ($(SYSTEM_OPENLDAP),) define gb_LinkTarget__use_openldap @@ -2268,7 +2268,7 @@ endef gb_ExternalProject__use_openldap := -else ifeq ($(SYSTEM_OPENLDAP),NO) +else # !SYSTEM_OPENLDAP define gb_LinkTarget__use_openldap $(call gb_LinkTarget_use_unpacked,$(1),openldap) @@ -2289,11 +2289,6 @@ $(call gb_ExternalProject_use_external_project,$(1),openldap) endef -else # no openldap - -gb_LinkTarget__use_openldap := -gb_ExternalProject__use_openldap := - endif # SYSTEM_OPENLDAP |