diff options
| -rw-r--r-- | Repository.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | connectivity/Module_connectivity.mk | 2 | ||||
| -rw-r--r-- | external/moz/Module_moz.mk | 2 | ||||
| -rw-r--r-- | external/msc-externals/Module_msc-externals.mk | 2 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 2 | ||||
| -rwxr-xr-x | postprocess/Rdb_services.mk | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/Repository.mk b/Repository.mk index 204a16bc0c2f..a97f652dc326 100644 --- a/Repository.mk +++ b/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 \ diff --git a/configure.ac b/configure.ac index c5a3d8a1eff1..6c453e2caf52 100644 --- a/configure.ac +++ b/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) diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 8d2253c8f779..210a4774dd0e 100644 --- a/connectivity/Module_connectivity.mk +++ b/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 \ diff --git a/external/moz/Module_moz.mk b/external/moz/Module_moz.mk index 9c4a245c9765..3f4b6ef8de2d 100644 --- a/external/moz/Module_moz.mk +++ b/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 \ diff --git a/external/msc-externals/Module_msc-externals.mk b/external/msc-externals/Module_msc-externals.mk index 8790e4fd310e..58a21953f094 100644 --- a/external/msc-externals/Module_msc-externals.mk +++ b/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: diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 6764568979e0..c4a44955b7ff 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/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 diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index e86a89fb0506..2e5a933978f8 100755 --- a/postprocess/Rdb_services.mk +++ b/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 \ )) |