normalize values of SYSTEM_LIBATOMIC_OPS, SYSTEM_FIREBIRD

Change-Id: I89802da0ad7f7bf838a8937430825b0adf42a6ee

RepositoryExternal.mk

@@ -728,7 +728,7 @@ gb_LinkTarget__use_jawt :=
 endif # $(OS)$(COM) = WNTGCC
 
 
-ifeq ($(SYSTEM_LIBATOMIC_OPS),YES)
+ifneq ($(SYSTEM_LIBATOMIC_OPS),)
 
 define gb_LinkTarget__use_libatomic_ops
 $(call gb_LinkTarget_set_include,$(1),\
@@ -2299,7 +2299,7 @@ endif # SYSTEM_OPENLDAP
 
 ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
 
-ifeq ($(SYSTEM_FIREBIRD),YES)
+ifneq ($(SYSTEM_FIREBIRD),)
 
 define gb_LinkTarget__use_libfbembed
 $(call gb_LinkTarget_set_include,$(1),\

configure.ac

@@ -8589,7 +8589,7 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
     AC_MSG_CHECKING([which Firebird to use])
     if test "$with_system_firebird" = "yes"; then
         AC_MSG_RESULT([external])
-        SYSTEM_FIREBIRD=YES
+        SYSTEM_FIREBIRD=TRUE
         AC_PATH_PROG(FIREBIRDCONFIG, [fb_config])
         if test -z "$FIREBIRDCONFIG"; then
             AC_MSG_NOTICE([No fb_config -- using pkg-config])
@@ -8635,11 +8635,11 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
             dnl ===================================================================
             libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >= 0.7.2])
             if test "$with_system_libatomic_ops" = "yes"; then
-                SYSTEM_LIBATOMIC_OPS=YES
+                SYSTEM_LIBATOMIC_OPS=TRUE
                 AC_CHECK_HEADERS(atomic_ops.h, [],
                 [AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], [])
             else
-                SYSTEM_LIBATOMIC_OPS=NO
+                SYSTEM_LIBATOMIC_OPS=
                 LIBATOMIC_OPS_CFLAGS="-I${WORKDIR}/UnpackedTarball/libatomic_ops/include"
                 LIBATOMIC_OPS_LIBS="-latomic_ops"
                 BUILD_TYPE="$BUILD_TYPE LIBATOMIC_OPS"
@@ -8647,7 +8647,7 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
         fi
 
         AC_MSG_RESULT([internal])
-        SYSTEM_FIREBIRD=NO
+        SYSTEM_FIREBIRD=
         FIREBIRD_CFLAGS="-I${WORKDIR}/UnpackedTarball/firebird/include"
         FIREBIRD_LIBS="-lfbembed"
 

external/firebird/ExternalProject_firebird.mk

@@ -30,9 +30,9 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 		unset MAKEFLAGS \
 		&& export PKG_CONFIG="" \
 		&& export CPPFLAGS=" \
-			$(if $(filter NO,$(SYSTEM_LIBATOMIC_OPS)), \
-			-I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \
-			,$(LIBATOMIC_OPS_CFLAGS)) \
+			$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_CFLAGS), \
+				-I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \
+			) \
 			" \
 		&& export CXXFLAGS=" \
 			$(if $(filter NO,$(SYSTEM_BOOST)), \

external/libatomic_ops/Module_libatomic_ops.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,libatomic_ops))
 
-ifeq ($(SYSTEM_LIBATOMIC_OPS),NO)
+ifeq ($(SYSTEM_LIBATOMIC_OPS),)
 
 $(eval $(call gb_Module_add_targets,libatomic_ops,\
 	ExternalProject_libatomic_ops \