normalize values of WITH_MOZAB4WIN

Change-Id: Iad5aa66635a34a4dfceb0bd6145f2d9bd197cc17

Repository.mk

@@ -375,11 +375,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 		$(if $(DISABLE_ATL),,oleautobridge) \
 		smplmail \
 		wininetbe1 \
-		$(if $(filter YES,$(WITH_MOZAB4WIN)), \
+		$(if $(WITH_MOZAB4WIN), \
 			mozab2 \
 			mozabdrv \
 		) \
-		$(if $(filter NO,$(WITH_MOZAB4WIN)),mozbootstrap) \
+		$(if $(WITH_MOZAB4WIN),,mozbootstrap) \
 	) \
 	$(if $(filter $(OS),WNT),, \
 		mork \

configure.ac

@@ -8679,7 +8679,7 @@ dnl ===================================================================
 if test "$_os" = "WINNT"; then
     AC_MSG_CHECKING([whether to enable build of Mozilla addressbook connectivity driver for Windows])
     if test "$enable_win_mozab_driver" = "yes" -a "$WITH_MINGW" != "YES" ; then
-        WITH_MOZAB4WIN=YES
+        WITH_MOZAB4WIN=TRUE
         AC_MSG_RESULT([yes, internal (old windows mozab driver)])
         BUILD_TYPE="$BUILD_TYPE MOZ"
         MSVC80_DLLS="msvcp80.dll msvcr80.dll Microsoft.VC80.CRT.manifest"
@@ -8691,7 +8691,7 @@ if test "$_os" = "WINNT"; then
         done
     else
         AC_MSG_RESULT([no])
-        WITH_MOZAB4WIN=NO
+        WITH_MOZAB4WIN=
     fi
 fi
 AC_SUBST(WITH_MOZAB4WIN)

connectivity/Module_connectivity.mk

@@ -104,7 +104,7 @@ endif
 
 ifeq ($(OS),WNT)
 
-ifeq ($(WITH_MOZAB4WIN),YES)
+ifneq ($(WITH_MOZAB4WIN),)
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_mozab \
 	Library_mozab \

external/moz/Module_moz.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,moz))
 
-ifeq ($(WITH_MOZAB4WIN),YES)
+ifneq ($(WITH_MOZAB4WIN),)
 
 $(eval $(call gb_Module_add_targets,moz,\
 	ExternalPackage_runtime \

external/msc-externals/Module_msc-externals.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,msc-externals))
 $(eval $(call gb_Module_add_targets,msc-externals,\
 	$(if $(ENABLE_CRASHDUMP),Package_dbghelp) \
 	Package_msvc_dlls \
-	$(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \
+	$(if $(WITH_MOZAB4WIN),Package_msvc80_dlls) \
 ))
 
 # vim: set noet sw=4 ts=4:

postprocess/CustomTarget_registry.mk

@@ -287,7 +287,7 @@ postprocess_FILES_main += \
 	$(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
 postprocess_DRIVERS += dbase flat mysql odbc
 ifeq (WNT,$(OS))
-ifeq ($(WITH_MOZAB4WIN),YES)
+ifneq ($(WITH_MOZAB4WIN),)
 postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/mozab)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
 postprocess_DRIVERS += mozab
 endif

postprocess/Rdb_services.mk

@@ -283,7 +283,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 
 ifeq ($(OS),WNT)
 
-ifeq ($(WITH_MOZAB4WIN),YES)
+ifneq ($(WITH_MOZAB4WIN),)
 $(eval $(call gb_Rdb_add_components,services,\
 	connectivity/source/drivers/mozab/mozab \
 ))