normalize values of SYSTEM_ODBC_HEADERS, SYSTEM_OPENLDAP

Change-Id: I913c38878a110625747fbf32ad9c43ad0dab30d3

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
 
 

configure.ac

@@ -8839,7 +8839,7 @@ dnl ===================================================================
 AC_MSG_CHECKING([which odbc headers to use])
 if test "$with_system_odbc" = "yes"; then
     AC_MSG_RESULT([external])
-    SYSTEM_ODBC_HEADERS=YES
+    SYSTEM_ODBC_HEADERS=TRUE
 
     AC_CHECK_HEADER(sqlext.h, [],
       [AC_MSG_ERROR(odbc not found. install odbc)], [])
@@ -8847,7 +8847,7 @@ elif test "$enable_database_connectivity" != yes; then
     AC_MSG_RESULT([none])
 else
     AC_MSG_RESULT([internal])
-    SYSTEM_ODBC_HEADERS=NO
+    SYSTEM_ODBC_HEADERS=
 fi
 AC_SUBST(SYSTEM_ODBC_HEADERS)
 
@@ -8860,13 +8860,13 @@ if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then
 AC_MSG_CHECKING([which openldap library to use])
 if test "$with_system_openldap" = "yes"; then
     AC_MSG_RESULT([external])
-    SYSTEM_OPENLDAP=YES
+    SYSTEM_OPENLDAP=TRUE
     AC_CHECK_HEADERS(ldap.h, [], [AC_MSG_ERROR(ldap.h not found. install openldap libs)], [])
     AC_CHECK_LIB([ldap], [ldap_simple_bind_s], [:], [AC_MSG_ERROR(openldap lib not found or functional)], [])
     AC_CHECK_LIB([ldap], [ldap_set_option], [:], [AC_MSG_ERROR(openldap lib not found or functional)], [])
 else
     AC_MSG_RESULT([internal])
-    SYSTEM_OPENLDAP=NO
+    SYSTEM_OPENLDAP=
     BUILD_TYPE="$BUILD_TYPE OPENLDAP"
 fi
 fi

external/openldap/Module_openldap.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,openldap))
 
-ifeq ($(SYSTEM_OPENLDAP),NO)
+ifeq ($(SYSTEM_OPENLDAP),)
 
 $(eval $(call gb_Module_add_targets,openldap,\
 	ExternalProject_openldap \

external/postgresql/ExternalProject_postgresql.mk

@@ -38,7 +38,7 @@ postgresql_LDFLAGS  += -L$(call gb_UnpackedTarball_get_dir,openssl)/
 endif
 endif
 
-ifeq ($(SYSTEM_OPENLDAP),NO)
+ifeq ($(SYSTEM_OPENLDAP),)
 postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openldap)/include
 postgresql_LDFLAGS  += \
 	-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs \