normalize values of BUILD_UNOWINREG

Change-Id: Iedbab675ffd10c6d353c44d99ddb4d32133d0717

configure.ac

@@ -7416,12 +7416,12 @@ if test "$enable_odk" = "" -o "$enable_odk" != "no"; then
         fi
         if test "$enable_build_unowinreg" = "" -o "$enable_build_unowinreg" = "no"; then
             AC_MSG_RESULT([no])
-            BUILD_UNOWINREG=NO
+            BUILD_UNOWINREG=
         else
             AC_MSG_RESULT([yes])
-            BUILD_UNOWINREG=YES
+            BUILD_UNOWINREG=TRUE
         fi
-        if test "$_os" != "WINNT" -a "$BUILD_UNOWINREG" = "YES"; then
+        if test "$_os" != "WINNT" -a "$BUILD_UNOWINREG" = "TRUE"; then
             if test -z "$with_mingw_cross_compiler"; then
                 dnl Guess...
                 AC_CHECK_PROGS(MINGWCXX,i386-mingw32msvc-g++ i586-pc-mingw32-g++ i686-pc-mingw32-g++ i686-w64-mingw32-g++,false)
@@ -7450,7 +7450,7 @@ if test "$enable_odk" = "" -o "$enable_odk" != "no"; then
     BUILD_TYPE="$BUILD_TYPE ODK"
 else
     AC_MSG_RESULT([no])
-    BUILD_UNOWINREG=NO
+    BUILD_UNOWINREG=
 fi
 AC_SUBST(BUILD_UNOWINREG)
 AC_SUBST(MINGWCXX)

odk/Module_odk.mk

@@ -41,7 +41,7 @@ endif
 
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
-	$(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
+	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
 	CustomTarget_javadoc \
 	GeneratedPackage_odk_javadoc \

odk/Package_unowinreg.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-ifeq ($(BUILD_UNOWINREG),YES)
+ifneq ($(BUILD_UNOWINREG),)
 ifeq ($(COM),MSC)
 odk_unowinreg_DIR := $(WORKDIR)/LinkTarget/Library
 else
 odk_unowinreg_DIR := $(call gb_CustomTarget_get_workdir,odk/unowinreg)
 endif
 odk_unowinreg_FILE := unowinreg.dll
-else # BUILD_UNOWINREG=NO
+else # !BUILD_UNOWINREG
 odk_unowinreg_DIR := $(TARFILE_LOCATION)
 odk_unowinreg_FILE := $(UNOWINREG_DLL)
 endif