Thu Feb 27 09:12:48 PST 2014

Makefile.fetch                                          |    2 
 Makefile.in                                             |    2 
 README.cross                                            |    2 
 bin/distro-install-desktop-integration                  |    4 
 bin/distro-install-file-lists                           |   14 +-
 configure.ac                                            |   89 ++++++++--------
 desktop/Executable_oosplash.mk                          |    2 
 external/Module_external.mk                             |    2 
 external/accessories/Module_accessories.mk              |    8 -
 external/cairo/ExternalProject_cairo.mk                 |    2 
 external/cairo/ExternalProject_pixman.mk                |    2 
 external/cppunit/ExternalProject_cppunit.mk             |    2 
 external/curl/ExternalProject_curl.mk                   |    2 
 external/epm/Module_epm.mk                              |    2 
 external/expat/ExternalProject_expat.mk                 |    2 
 external/firebird/ExternalProject_firebird.mk           |    2 
 external/harfbuzz/ExternalProject_harfbuzz.mk           |    2 
 external/hunspell/ExternalProject_hunspell.mk           |    2 
 external/hyphen/ExternalProject_hyphen.mk               |    2 
 external/icu/ExternalProject_icu.mk                     |    4 
 external/lcms2/ExternalProject_lcms2.mk                 |    2 
 external/libabw/ExternalProject_libabw.mk               |    2 
 external/libatomic_ops/ExternalProject_libatomic_ops.mk |    2 
 external/libcdr/ExternalProject_libcdr.mk               |    2 
 external/libebook/ExternalProject_libebook.mk           |    2 
 external/libetonyek/ExternalProject_libetonyek.mk       |    2 
 external/libexttextcat/ExternalProject_exttextcat.mk    |    2 
 external/libfreehand/ExternalProject_libfreehand.mk     |    2 
 external/liblangtag/ExternalProject_langtag.mk          |    2 
 external/libmspub/ExternalProject_libmspub.mk           |    2 
 external/libmwaw/ExternalProject_libmwaw.mk             |    2 
 external/libodfgen/ExternalProject_libodfgen.mk         |    2 
 external/liborcus/ExternalProject_liborcus.mk           |    2 
 external/libvisio/ExternalProject_libvisio.mk           |    2 
 external/libwpd/ExternalProject_libwpd.mk               |    2 
 external/libwpg/ExternalProject_libwpg.mk               |    2 
 external/libwps/ExternalProject_libwps.mk               |    2 
 external/libxml2/ExternalProject_xml2.mk                |    4 
 external/libxmlsec/ExternalProject_xmlsec.mk            |    2 
 external/libxslt/ExternalProject_xslt.mk                |    4 
 external/mythes/ExternalProject_mythes.mk               |    2 
 external/nss/ExternalProject_nss.mk                     |    4 
 external/openldap/ExternalProject_openldap.mk           |    2 
 external/poppler/ExternalProject_poppler.mk             |    2 
 external/postgresql/ExternalProject_postgresql.mk       |    2 
 external/python3/ExternalProject_python3.mk             |    2 
 external/redland/ExternalProject_raptor.mk              |    2 
 external/redland/ExternalProject_rasqal.mk              |    2 
 external/redland/ExternalProject_redland.mk             |    2 
 external/redland/UnpackedTarball_rasqal.mk              |    2 
 external/redland/UnpackedTarball_redland.mk             |    2 
 i18npool/CustomTarget_breakiterator.mk                  |    8 -
 m4/libo_check_extension.m4                              |    2 
 scp2/InstallScript_setup_osl.mk                         |    2 
 solenv/bin/modules/installer.pm                         |    2 
 solenv/bin/modules/installer/control.pm                 |    2 
 solenv/gbuild/extensions/post_SpeedUpTargets.mk         |    2 
 svtools/Module_svtools.mk                               |    2 
 testtools/Module_testtools.mk                           |    2 
 vcl/Library_vclplug_gen.mk                              |    2 
 60 files changed, 121 insertions(+), 120 deletions(-)

New commits:
commit c3bdaca0e6c26775fae7f682732251a8e72cff30
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 27 17:51:53 2014 +0100

    normalize values of ICU_RECLASSIFIED_*
    
    Change-Id: I1033676fe91062b1d364a458a5964cfb78f323f0

diff --git a/configure.ac b/configure.ac
index fdce19d..7639f45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8813,10 +8813,10 @@ SYSTEM_GENCMN=
 
 ICU_MAJOR=52
 ICU_MINOR=1
-ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
-ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
-ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="YES"
-ICU_RECLASSIFIED_HEBREW_LETTER="YES"
+ICU_RECLASSIFIED_CLOSE_PARENTHESIS="TRUE"
+ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
+ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
+ICU_RECLASSIFIED_HEBREW_LETTER="TRUE"
 AC_MSG_CHECKING([which icu to use])
 if test "$with_system_icu" = "yes"; then
     AC_MSG_RESULT([external])
@@ -8878,18 +8878,18 @@ You can use --with-system-icu-for-build=force to use it anyway.])
             AC_MSG_ERROR([\'gencmn\' not found in \$PATH, install the icu development tool \'gencmn\'])
         fi
         if test "$ICU_MAJOR" -ge "49" -o \( "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4" \); then
-            ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
+            ICU_RECLASSIFIED_CLOSE_PARENTHESIS="TRUE"
         else
-            ICU_RECLASSIFIED_CLOSE_PARENTHESIS="NO"
+            ICU_RECLASSIFIED_CLOSE_PARENTHESIS=
         fi
         if test "$ICU_MAJOR" -ge "49"; then
-            ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
-            ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="YES"
-            ICU_RECLASSIFIED_HEBREW_LETTER="YES"
+            ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
+            ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
+            ICU_RECLASSIFIED_HEBREW_LETTER="TRUE"
         else
-            ICU_RECLASSIFIED_PREPEND_SET_EMPTY="NO"
-            ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="NO"
-            ICU_RECLASSIFIED_HEBREW_LETTER="NO"
+            ICU_RECLASSIFIED_PREPEND_SET_EMPTY=
+            ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=
+            ICU_RECLASSIFIED_HEBREW_LETTER=
         fi
     fi
 
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index e01e543..dbe6ab2 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -78,12 +78,12 @@ $(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(call gb_ExternalExecutable_g
 $(i18npool_BIDIR)/%.txt : \
 	$(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir
 	sed -e ': dummy' \
-		$(if $(filter YES,$(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)),-e "s#\[:LineBreak =  Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#") \
-		$(if $(filter-out YES,$(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER)),\
+		$(if $(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),-e "s#\[:LineBreak =  Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#") \
+		$(if $(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER),,\
 			-e '/\[:LineBreak =  Conditional_Japanese_Starter:\]/d' \
 			-e 's# $$CJ##' \
 		) \
-		$(if $(filter-out YES,$(ICU_RECLASSIFIED_HEBREW_LETTER)),\
+		$(if $(ICU_RECLASSIFIED_HEBREW_LETTER),,\
 			-e '/\[:LineBreak =  Hebrew_Letter:\]/d' \
 			-e '/^$$HLcm =/d' \
 			-e '/^$$HLcm $$NUcm;/d' \
@@ -93,7 +93,7 @@ $(i18npool_BIDIR)/%.txt : \
 			-e 's#$$HLcm ##g' \
 			-e 's# $$HL##g' \
 		) \
-		$(if $(filter YES,$(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)),-e "/Prepend/d") \
+		$(if $(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),-e "/Prepend/d") \
 		$< > $@
 
 # vim: set noet sw=4 ts=4:
commit bb1b45f1905549ad654564f8e5a12d19bfce60ff
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 27 17:41:54 2014 +0100

    normalize values of SPLIT_OPT_FEATURES/SPLIT_APP_MODULES
    
    Change-Id: I14692a566cea6c5939360d62fd4b82c9feb0aa40

diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 24cac1d..b0d962a 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -88,7 +88,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
     # it is not a real extension; it used to be in the main package...
     merge_flists gid_Module_Optional_Extensions_Script_Provider_For_JS $FILELISTSDIR/common_list.txt
 
-    if test "$SPLIT_APP_MODULES" = "YES" ; then
+    if test "$SPLIT_APP_MODULES" = "TRUE" ; then
         merge_flists gid_Module_Prg_Base_Bin      $FILELISTSDIR/base_list.txt
         merge_flists gid_Module_Prg_Calc_Bin      $FILELISTSDIR/calc_list.txt
         merge_flists gid_Module_Prg_Draw_Bin      $FILELISTSDIR/draw_list.txt
@@ -125,7 +125,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
         merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt
     fi
 
-    if test "$SPLIT_APP_MODULES" = "YES" -a "$OOO_VENDOR" = "SUSE" ; then
+    if test "$SPLIT_APP_MODULES" = "TRUE" -a "$OOO_VENDOR" = "SUSE" ; then
         # move the prebuilt icons into a hacky temporary package
         # we want to repack them into a noarch package as soon as possible
         # without the build dependency on the huge devel package
@@ -134,7 +134,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
         merge_flists gid_Module_Root_Files_Images $FILELISTSDIR/common_list.txt
     fi
 
-    if test "$SPLIT_OPT_FEATURES" = "YES" ; then
+    if test "$SPLIT_OPT_FEATURES" = "TRUE" ; then
         if test "z$OOO_VENDOR" = "zMandriva" ; then
             merge_flists gid_Module_Optional_Grfflt            $FILELISTSDIR/draw_list.txt
             merge_flists gid_Module_Optional_Headless          $FILELISTSDIR/common_list.txt
@@ -165,7 +165,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
     # lang packs
     for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
         lang_lists=
-        if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then
+        if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "TRUE" \) ; then
             test -f gid_Module_Langpack_Basis_$lang     && lang_lists="$lang_lists gid_Module_Langpack_Basis_$lang" || :
             test -f gid_Module_Langpack_Brand_$lang     && lang_lists="$lang_lists gid_Module_Langpack_Brand_$lang" || :
             test -f gid_Module_Langpack_Resource_$lang  && lang_lists="$lang_lists gid_Module_Langpack_Resource_$lang" || :
@@ -196,7 +196,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
         fi
         # some help files are in _Langpack_{Writer,Impress,...}_<lang>
         # move them from -l10n to -help
-        if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then
+        if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "TRUE" \) ; then
             for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
                 test -f $FILELISTSDIR/help_${lang}_list.txt || continue;
                 mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/help/.*
@@ -205,7 +205,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
         fi
     done
 
-    if test -f $FILELISTSDIR/lang_en_US_list.txt -a "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" != "YES" ; then
+    if test -f $FILELISTSDIR/lang_en_US_list.txt -a "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" != "TRUE" ; then
         cat $FILELISTSDIR/lang_en_US_list.txt >>$FILELISTSDIR/common_list.txt
         rm $FILELISTSDIR/lang_en_US_list.txt
     fi
@@ -263,7 +263,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
     test -f $DESTDIR/gid_Module_Optional_PostgresqlSdbc && cp $DESTDIR/gid_Module_Optional_PostgresqlSdbc postgresql_list.txt || :
 
     # mailmerge
-    if test "$SPLIT_OPT_FEATURES" = "YES" ; then
+    if test "$SPLIT_OPT_FEATURES" = "TRUE" ; then
         if test "z$OOO_VENDOR" = "zMandriva" ; then
             flist=pyuno_list.txt
         else
diff --git a/configure.ac b/configure.ac
index 7581b2d..fdce19d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10109,13 +10109,13 @@ dnl ===================================================================
 
 SPLIT_APP_MODULES=""
 if test "$enable_split_app_modules" = "yes"; then
-    SPLIT_APP_MODULES="YES"
+    SPLIT_APP_MODULES="TRUE"
 fi
 AC_SUBST(SPLIT_APP_MODULES)
 
 SPLIT_OPT_FEATURES=""
 if test "$enable_split_opt_features" = "yes"; then
-    SPLIT_OPT_FEATURES="YES"
+    SPLIT_OPT_FEATURES="TRUE"
 fi
 AC_SUBST(SPLIT_OPT_FEATURES)
 
@@ -10286,7 +10286,7 @@ if test $_os != iOS -a $_os != Android -a "x$enable_opencl" != "xno"; then
         AC_MSG_RESULT([disabled on OS X 10.5])
     else
         AC_MSG_RESULT([yes])
-        ENABLE_OPENCL=YES
+        ENABLE_OPENCL=TRUE
         AC_DEFINE(HAVE_FEATURE_OPENCL)
     fi
 else
commit 6dc9979507234b5c17199389b58c02d4a7ef144c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 27 17:04:07 2014 +0100

    normalize values of WITH_EXTENSION_INTEGRATION/WITH_HELPPACK_INTEGRATION
    
    Change-Id: I198f77d927c9283914924440cdf0cece619bc867

diff --git a/configure.ac b/configure.ac
index 01682b7..7581b2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11246,10 +11246,10 @@ dnl Test whether to integrate helppacks into the product's installer
 dnl ===================================================================
 AC_MSG_CHECKING([for helppack integration])
 if test "$with_helppack_integration" = "no"; then
-    WITH_HELPPACK_INTEGRATION=NO
+    WITH_HELPPACK_INTEGRATION=
     AC_MSG_RESULT([no integration])
 else
-    WITH_HELPPACK_INTEGRATION=YES
+    WITH_HELPPACK_INTEGRATION=TRUE
     SCPDEFS="$SCPDEFS -DWITH_HELPPACK_INTEGRATION"
     AC_MSG_RESULT([integration])
 fi
@@ -11260,11 +11260,11 @@ AC_SUBST(WITH_HELPPACK_INTEGRATION)
 ###############################################################################
 AC_MSG_CHECKING([for extensions integration])
 if test "x$enable_extension_integration" != "xno"; then
-    WITH_EXTENSION_INTEGRATION=YES
+    WITH_EXTENSION_INTEGRATION=TRUE
     SCPDEFS="$SCPDEFS -DWITH_EXTENSION_INTEGRATION"
     AC_MSG_RESULT([yes, use integration])
 else
-    WITH_EXTENSION_INTEGRATION=NO
+    WITH_EXTENSION_INTEGRATION=
     AC_MSG_RESULT([no, do not integrate])
 fi
 AC_SUBST(WITH_EXTENSION_INTEGRATION)
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index 75f2a8c2..fe8a54a 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
 	$(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\
 		scp2/crashrep \
 	) \
-	$(if $(filter YES,$(WITH_EXTENSION_INTEGRATION)),\
+	$(if $(WITH_EXTENSION_INTEGRATION),\
 		scp2/extensions \
 	) \
 	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
commit 935b30c0abd630f387800900f24623f1e0632cb4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 27 17:00:58 2014 +0100

    normalize values of WITH_EXTRA_EXTENSIONS
    
    Change-Id: I9f084a363bdeab800f0039f9be19d03225a1a8ce

diff --git a/configure.ac b/configure.ac
index 2223380..01682b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11329,7 +11329,7 @@ else
         esac
     fi
     done
-    WITH_EXTRA_EXTENSIONS=YES
+    WITH_EXTRA_EXTENSIONS=TRUE
     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
 fi
 AC_SUBST(SUNTEMPLATES_DE_PACK)
diff --git a/external/Module_external.mk b/external/Module_external.mk
index e344b7e..cef4e59 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,LPSOLVE,lpsolve) \
 	$(call gb_Helper_optional,MARIADB,libmariadb) \
 	$(call gb_Helper_optional,MDDS,mdds) \
-	$(if $(filter YES,$(WITH_EXTRA_EXTENSIONS)),misc_extensions) \
+	$(if $(WITH_EXTRA_EXTENSIONS),misc_extensions) \
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
 	$(call gb_Helper_optional,MOZ,moz) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
diff --git a/m4/libo_check_extension.m4 b/m4/libo_check_extension.m4
index 0f2dc01..785f78b 100644
--- a/m4/libo_check_extension.m4
+++ b/m4/libo_check_extension.m4
@@ -17,7 +17,7 @@ if test "x$enable_ext_$3" = "xyes" -a "x$enable_extension_integration" != "xno";
     SCPDEFS="$SCPDEFS -DWITH_EXTENSION_$2"
     $2_EXTENSION_PACK="$5"
     BUILD_TYPE="$BUILD_TYPE $2"
-    WITH_EXTRA_EXTENSIONS=YES
+    WITH_EXTRA_EXTENSIONS=TRUE
     AC_MSG_RESULT([yes])
 else
     AC_MSG_RESULT([no])
commit ac281f748a8d449dad418d34801de3a41cf78509
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 27 16:55:12 2014 +0100

    normalize values of WITHOUT_PPDS/WITH_FONTS
    
    Change-Id: I2a3d402458999fa8bf953a500edc07120648d62a

diff --git a/configure.ac b/configure.ac
index 54d48ab..2223380 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11371,11 +11371,11 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to include third-party fonts])
 if test "$with_fonts" != "no"; then
     AC_MSG_RESULT([yes])
-    WITH_FONTS=YES
+    WITH_FONTS=TRUE
     BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
 else
     AC_MSG_RESULT([no])
-    WITH_FONTS=NO
+    WITH_FONTS=
     SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
     if test "$test_fontconfig" = "yes"; then
         AC_PATH_PROG([FCMATCH], [fc-match])
@@ -11402,9 +11402,10 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to include PPDs])
 if test "$with_ppds" != "no"; then
     AC_MSG_RESULT([yes])
+    WITHOUT_PPDS=
 else
     AC_MSG_RESULT([no])
-    WITHOUT_PPDS=YES
+    WITHOUT_PPDS=TRUE
     SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
 fi
 AC_SUBST(WITHOUT_PPDS)
commit b0253e343f7eb391c0be64311488f6ab673e1ae1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 27 16:51:05 2014 +0100

    normalize values of WITH_EXTRA_FONT/WITH_EXTRA_SAMPLE/etc.
    
    Change-Id: I406669380ece23d2acd3e9df2731d7e486696778

diff --git a/configure.ac b/configure.ac
index ea22c007..54d48ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11415,11 +11415,11 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to include extra galleries])
 if test "$enable_extra_gallery" = "" -o "$enable_extra_gallery" = "no"; then
     AC_MSG_RESULT([no])
-    WITH_EXTRA_GALLERY=NO
+    WITH_EXTRA_GALLERY=
     OOOP_GALLERY_PACK=""
 else
     AC_MSG_RESULT([yes])
-    WITH_EXTRA_GALLERY=YES
+    WITH_EXTRA_GALLERY=TRUE
     BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY"
     SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY"
     OOOP_GALLERY_PACK="af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip"
@@ -11433,11 +11433,11 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to include extra templates])
 if test "$enable_extra_template" = "" -o "$enable_extra_template" = "no"; then
     AC_MSG_RESULT([no])
-    WITH_EXTRA_TEMPLATE=NO
+    WITH_EXTRA_TEMPLATE=
     OOOP_TEMPLATES_PACK=""
 else
     AC_MSG_RESULT([yes])
-    WITH_EXTRA_TEMPLATE=YES
+    WITH_EXTRA_TEMPLATE=TRUE
     BUILD_TYPE="$BUILD_TYPE EXTRA_TEMPLATE"
     SCPDEFS="$SCPDEFS -DWITH_EXTRA_TEMPLATE"
     OOOP_TEMPLATES_PACK="1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip"
@@ -11451,11 +11451,11 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to include extra samples])
 if test "$enable_extra_sample" = "" -o "$enable_extra_sample" = "no"; then
     AC_MSG_RESULT([no])
-    WITH_EXTRA_SAMPLE=NO
+    WITH_EXTRA_SAMPLE=
     OOOP_SAMPLES_PACK=""
 else
     AC_MSG_RESULT([yes])
-    WITH_EXTRA_SAMPLE=YES
+    WITH_EXTRA_SAMPLE=TRUE
     BUILD_TYPE="$BUILD_TYPE EXTRA_SAMPLE"
     SCPDEFS="$SCPDEFS -DWITH_EXTRA_SAMPLE"
     OOOP_SAMPLES_PACK="a6bccacf44914969e6e7b2f8faf4132c-OOOP-samples-pack-2.7.0.0.zip"
@@ -11469,11 +11469,11 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to include extra fonts])
 if test "$enable_extra_font" = "" -o "$enable_extra_font" = "no"; then
     AC_MSG_RESULT([no])
-    WITH_EXTRA_FONT=NO
+    WITH_EXTRA_FONT=
     OOOP_FONTS_PACK=""
 else
     AC_MSG_RESULT([yes])
-    WITH_EXTRA_FONT=YES
+    WITH_EXTRA_FONT=TRUE
     BUILD_TYPE="$BUILD_TYPE EXTRA_FONT"
     SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT"
     OOOP_FONTS_PACK="a10aa597411643326e27d7fc128af12d-OOOP-fonts-pack-2.9.0.0.zip"
diff --git a/external/accessories/Module_accessories.mk b/external/accessories/Module_accessories.mk
index 1b0b1cf..9667256 100644
--- a/external/accessories/Module_accessories.mk
+++ b/external/accessories/Module_accessories.mk
@@ -9,14 +9,14 @@
 
 $(eval $(call gb_Module_Module,accessories))
 
-ifeq ($(WITH_EXTRA_FONT),YES)
+ifneq ($(WITH_EXTRA_FONT),)
 $(eval $(call gb_Module_add_targets,accessories,\
 	ExternalPackage_extra_fonts \
 	UnpackedTarball_fonts_pack \
 ))
 endif
 
-ifeq ($(WITH_EXTRA_GALLERY),YES)
+ifneq ($(WITH_EXTRA_GALLERY),)
 $(eval $(call gb_Module_add_targets,accessories,\
 	UnpackedTarball_gallery_pack \
 	ExternalPackage_accessoriesgallery \
@@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_targets,accessories,\
 ))
 endif
 
-ifeq ($(WITH_EXTRA_SAMPLE),YES)
+ifneq ($(WITH_EXTRA_SAMPLE),)
 $(eval $(call gb_Module_add_l10n_targets,accessories,\
 	AllLangPackage_accessoriessamples \
 	AllLangPackage_accessoriessamplesadvertisement \
@@ -54,7 +54,7 @@ $(eval $(call gb_Module_add_targets,accessories,\
 ))
 endif
 
-ifeq ($(WITH_EXTRA_TEMPLATE),YES)
+ifneq ($(WITH_EXTRA_TEMPLATE),)
 $(eval $(call gb_Module_add_l10n_targets,accessories,\
 	AllLangPackage_accessoriestemplates \
 	AllLangPackage_accessoriestemplateseducate \
commit 55407935f95086e6df81869ca01c8da16c83804a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 27 16:31:11 2014 +0100

    normalize values of USE_XINERAMA
    
    Change-Id: Iac70c0872b723f57a63b0df3759c3c6d38271eea

diff --git a/configure.ac b/configure.ac
index 13ac3da..ea22c007 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11530,7 +11530,7 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
     if test -e "$XINERAMALIB/libXinerama.so" -a -e "$XINERAMALIB/libXinerama.a"; then
         # we have both versions, let the user decide but use the dynamic one
         # per default
-        USE_XINERAMA=YES
+        USE_XINERAMA=TRUE
         if test -z "$with_static_xinerama" -o -n "$with_system_libs"; then
             XINERAMA_LINK=dynamic
         else
@@ -11538,23 +11538,23 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
         fi
     elif test -e "$XINERAMALIB/libXinerama.so" -a ! -e "$XINERAMALIB/libXinerama.a"; then
         # we have only the dynamic version
-        USE_XINERAMA=YES
+        USE_XINERAMA=TRUE
         XINERAMA_LINK=dynamic
     elif test -e "$XINERAMALIB/libXinerama.a"; then
         # static version
         if echo $host_cpu | $GREP -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
-            USE_XINERAMA=YES
+            USE_XINERAMA=TRUE
             XINERAMA_LINK=static
         else
-            USE_XINERAMA=NO
+            USE_XINERAMA=
             XINERAMA_LINK=none
         fi
     else
         # no Xinerama
-        USE_XINERAMA=NO
+        USE_XINERAMA=
         XINERAMA_LINK=none
     fi
-    if test "$USE_XINERAMA" = "YES"; then
+    if test "$USE_XINERAMA" = "TRUE"; then
         AC_MSG_RESULT([yes, with $XINERAMA_LINK linking])
         AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
             [AC_MSG_ERROR(Xinerama header not found.)], [])
@@ -11575,7 +11575,7 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
         AC_MSG_RESULT([no, libXinerama not found or wrong architecture.])
     fi
 else
-    USE_XINERAMA=NO
+    USE_XINERAMA=
     XINERAMA_LINK=none
     AC_MSG_RESULT([no])
 fi
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index d3e3750..3f49b2d 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Executable_add_cobjects,oosplash,\
     desktop/unx/source/start \
 ))
 
-ifeq ($(USE_XINERAMA),YES)
+ifneq ($(USE_XINERAMA),)
 
 $(eval $(call gb_Executable_add_defs,oosplash,\
     -DUSE_XINERAMA \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 64d2c01..51dd6922 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -116,7 +116,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\
 endif
 
 ## handle Xinerama
-ifneq ($(USE_XINERAMA),NO)
+ifneq ($(USE_XINERAMA),)
 ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun)
 # not Solaris/Xsun
 $(eval $(call gb_Library_add_defs,vclplug_gen,\
commit a957ec02f4071ebabd36e8087fd5d5173eb734de
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 27 16:25:22 2014 +0100

    normalize values of WITH_COMPAT_OOWRAPPERS
    
    Change-Id: Ia397d944edf2a06a83e42dd792fc80906978e1bc

diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 9589af6..0379ffa 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -69,7 +69,7 @@ add_wrapper()
 
     # do we want compat oowrapper?
     oowrapper_name=""
-    if test "$WITH_COMPAT_OOWRAPPERS" = 'YES' ; then
+    if test "$WITH_COMPAT_OOWRAPPERS" = 'TRUE' ; then
         oowrapper_name=`echo "$lowrapper_name" | sed -e "s/^lo/oo/"`
         # "oo" prefix only for wrappers stating with "lo" prefix
         test "$oowrapper_name" = "$lowrapper_name" && oowrapper_name=
@@ -181,7 +181,7 @@ test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTD
 mkdir -p $DESTDIR/etc/bash_completion.d
 ./bin/generate-bash-completion bin/bash-completion.in $DESTDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh
 test -f $DESTDIR/gid_Module_Root_Brand && echo "/etc/bash_completion.d/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
-if test "$WITH_COMPAT_OOWRAPPERS" = "YES" ; then
+if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
     ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/etc/bash_completion.d/ooffice.sh
     test -f $DESTDIR/gid_Module_Root_Brand && echo "/etc/bash_completion.d/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
 fi
diff --git a/configure.ac b/configure.ac
index 2e7be6c..13ac3da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12168,7 +12168,7 @@ AC_SUBST(OOO_VENDOR)
 
 AC_MSG_CHECKING([whether to install the compat oo* wrappers])
 if test "$with_compat_oowrappers" = "yes"; then
-    WITH_COMPAT_OOWRAPPERS=YES
+    WITH_COMPAT_OOWRAPPERS=TRUE
     AC_MSG_RESULT(yes)
 else
     WITH_COMPAT_OOWRAPPERS=
commit d729d169de479e622e8767edd72aee3ae5bc61a9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 27 16:19:43 2014 +0100

    normalize values of CROSS_COMPILING
    
    Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141

diff --git a/Makefile.fetch b/Makefile.fetch
index b0d77dd..5fd5809 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -60,7 +60,7 @@ $(call fetch__Download_item,$1,$($2),$($(subst _TARBALL,_MD5SUM,$(2))))
 endef
 
 fetch_BUILD_TYPE := $(sort $(BUILD_TYPE))
-ifeq ($(CROSS_COMPILING),YES)
+ifneq ($(CROSS_COMPILING),)
 fetch_BUILD_TYPE := $(sort $(fetch_BUILD_TYPE) $(shell . $(SRCDIR)/bin/get_config_variables --build BUILD_TYPE && echo $$BUILD_TYPE))
 endif
 
diff --git a/Makefile.in b/Makefile.in
index a7a0965..98a25e2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -136,7 +136,7 @@ clean-host:
 	rm -fr install
 
 clean-build:
-ifeq ($(CROSS_COMPILING),YES)
+ifneq ($(CROSS_COMPILING),)
 	rm -fr $(INSTDIR_FOR_BUILD)
 	rm -fr $(WORKDIR_FOR_BUILD)
 endif
diff --git a/README.cross b/README.cross
index 6fcedf9..0de6475 100644
--- a/README.cross
+++ b/README.cross
@@ -403,7 +403,7 @@ Then create pkg-config wrapper, something like:
 $ cat > pkg-config-wrapper-host << _EOF
 #!/bin/sh
 
-if [ "$CROSS_COMPILING" = YES ]; then
+if [ "$CROSS_COMPILING" = TRUE ]; then
    SYSROOT=$HOME/lo/raspbian-root
    export PKG_CONFIG_PATH=${SYSROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig:${SYSROOT}/usr/share/pkgconfig
    export PKG_CONFIG_LIBDIR=${SYSROOT}/usr/lib/pkgconfig
diff --git a/configure.ac b/configure.ac
index 4bf51b7..2e7be6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3263,7 +3263,7 @@ AC_SUBST(DISABLE_ACTIVEX)
 AC_SUBST(DISABLE_ATL)
 
 if test "$cross_compiling" = "yes"; then
-    export CROSS_COMPILING=YES
+    export CROSS_COMPILING=TRUE
     SCPDEFS="$SCPDEFS -DCROSS_COMPILING"
 else
     CROSS_COMPILING=
@@ -5748,7 +5748,7 @@ using namespace std;
             if test -n "$MINGW_GXXDLL"; then
                 mingw_gxxdll_root=${MINGW_GXXDLL%.dll}
                 mingw_gxxdll_root=${mingw_gxxdll_root#lib}
-                if test "$CROSS_COMPILING" = "YES"; then
+                if test "$CROSS_COMPILING" = "TRUE"; then
                     dnl m4 escaping!
                     mingw_gxxdll_root=${mingw_gxxdll_root%-[[0-9]]}
                 fi
@@ -7951,7 +7951,7 @@ case $enable_python in
 system)
     SYSTEM_PYTHON=TRUE
 
-    if test "$CROSS_COMPILING" != YES; then
+    if test "$CROSS_COMPILING" != TRUE; then
         dnl Check if the headers really work
         save_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
@@ -12623,7 +12623,7 @@ AC_CONFIG_HEADERS([config_host/config_version.h])
 AC_CONFIG_HEADERS([config_host/config_oauth2.h])
 AC_OUTPUT
 
-if test "$CROSS_COMPILING" = YES; then
+if test "$CROSS_COMPILING" = TRUE; then
     (echo; echo export BUILD_TYPE_FOR_HOST=$BUILD_TYPE) >>config_build.mk
 fi
 
@@ -12679,7 +12679,7 @@ $GNUMAKE help
 
 _EOF
 
-if test $_os != WINNT -a "$CROSS_COMPILING" != YES; then
+if test $_os != WINNT -a "$CROSS_COMPILING" != TRUE; then
     cat << _EOF
 After the build has finished, your can immediately run it using:
 instdir/program/soffice
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index d055db0..cc26096 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 		--disable-valgrind \
 		$(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \
 		--disable-svg --enable-gtk-doc=no --enable-test-surfaces=no \
-		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+		$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 	&& cp cairo-version.h src/cairo-version.h \
 	&& cd src && $(MAKE) \
diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk
index 80e62fa..8eb7d8c 100644
--- a/external/cairo/ExternalProject_pixman.mk
+++ b/external/cairo/ExternalProject_pixman.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,pixman,build) :
 		./configure \
 		$(if $(filter MACOSX IOS,$(OS)),--disable-shared,--disable-static) \
 		$(if $(filter ANDROID,$(OS)),--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt) \
-		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+		$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
 
diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk
index cc4b9ad..8e74259 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -49,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
 			--disable-doxygen \
 			--disable-html-docs \
 			--disable-latex-docs \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \
 			$(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
 			$(if $(filter SOLARIS,$(OS)),LIBS="-lm") \
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index e67fdf2..3f3336b 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -47,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 			--without-ssl \
 			--without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
 			--disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
 			$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
diff --git a/external/epm/Module_epm.mk b/external/epm/Module_epm.mk
index 1f4ed07..179537c 100644
--- a/external/epm/Module_epm.mk
+++ b/external/epm/Module_epm.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,epm))
 
-ifneq ($(CROSS_COMPILING),YES)
+ifeq ($(CROSS_COMPILING),)
 
 $(eval $(call gb_Module_add_targets,epm,\
 	ExternalProject_epm \
diff --git a/external/expat/ExternalProject_expat.mk b/external/expat/ExternalProject_expat.mk
index 2fdaf5e..0cc1eaa 100644
--- a/external/expat/ExternalProject_expat.mk
+++ b/external/expat/ExternalProject_expat.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,expat,\
 $(call gb_ExternalProject_get_state_target,expat,configure) :
 	$(call gb_ExternalProject_run,configure,\
 		./configure \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 	,,expat_configure.log)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 470500f..6e3f582 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 			--disable-superserver \
 			--with-system-icu --without-fbsample --without-fbsample-db \
 			$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
 		&& $(if $(filter WNT,$(OS)),\
 			   PATH="$(shell cygpath -u $(call gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk
index f49553d..5e59dcb 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
 			--with-freetype=no \
 			--with-cairo=no \
 			--with-glib=no \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \
 	)
 
diff --git a/external/hunspell/ExternalProject_hunspell.mk b/external/hunspell/ExternalProject_hunspell.mk
index 6bbb618..2b1ab8b 100644
--- a/external/hunspell/ExternalProject_hunspell.mk
+++ b/external/hunspell/ExternalProject_hunspell.mk
@@ -17,7 +17,7 @@ $(call gb_ExternalProject_get_state_target,hunspell,build):
 	$(call gb_ExternalProject_run,build,\
 		LIBS="$(gb_STDLIBS) $(LIBS)" \
 		./configure --disable-shared --disable-nls --with-pic \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
 			$(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
 			$(if $(filter C53,$(COM)),CFLAGS="-xc99=none") \
 			$(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \
diff --git a/external/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk
index 28b8323..c301023 100644
--- a/external/hyphen/ExternalProject_hyphen.mk
+++ b/external/hyphen/ExternalProject_hyphen.mk
@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,hyphen,build):
 	$(call gb_ExternalProject_run,build,\
 		./configure --disable-shared \
 			$(if $(filter-out IOS,$(OS)),--with-pic) \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
 		&& $(MAKE) \
 	)
 
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index bc56ce8..fa6ea58 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 		LDFLAGS="-L$(COMPATH)/lib -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 \
 				$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
 		./configure \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 			--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \
 			--disable-layout --disable-static --enable-shared --disable-samples \
 		&& $(MAKE) \
@@ -83,7 +83,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),\
 				--enable-static --disable-shared,\
 				--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
 				--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source)\
 		&& $(MAKE) \
 		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index e128b24..80472f5 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -26,7 +26,7 @@ else
 $(call gb_ExternalProject_get_state_target,lcms2,build):
 	$(call gb_ExternalProject_run,build,\
 		./configure --without-jpeg --without-tiff --with-pic \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			CPPFLAGS=" $(SOLARINC)" \
 			$(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \
 			$(if $(filter IOS ANDROID,$(OS)), --disable-shared --enable-static, --enable-shared --disable-static) \
diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk
index 6afcfb8..1bcb33d 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
 				-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
 			$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 		    $(if $(VERBOSE)$(verbose),V=1) \
 		    $(MAKE)) \
diff --git a/external/libatomic_ops/ExternalProject_libatomic_ops.mk b/external/libatomic_ops/ExternalProject_libatomic_ops.mk
index 06ec521..28384ad 100644
--- a/external/libatomic_ops/ExternalProject_libatomic_ops.mk
+++ b/external/libatomic_ops/ExternalProject_libatomic_ops.mk
@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,libatomic_ops,build) :
 	$(call gb_ExternalProject_run,build,\
 		$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \
 		./configure \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
 
diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk
index 087adbf..d96b0b2 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 			--disable-werror \
 			--disable-weffc \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 		    $(if $(VERBOSE)$(verbose),V=1) \
 		    $(MAKE)) \
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk
index 6da1870..b4e2bd6 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
 			XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
 			XML_LIBS="$(LIBXML_LIBS)" \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& cd src/lib \
 		&& $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \
 	)
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index cbd0a9e..1108282 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 			BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
 			XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
 			XML_LIBS="$(LIBXML_LIBS)" \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \
 	)
 
diff --git a/external/libexttextcat/ExternalProject_exttextcat.mk b/external/libexttextcat/ExternalProject_exttextcat.mk
index 330d0f0..89bd169 100644
--- a/external/libexttextcat/ExternalProject_exttextcat.mk
+++ b/external/libexttextcat/ExternalProject_exttextcat.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,exttextcat,\
 $(call gb_ExternalProject_get_state_target,exttextcat,build):
 	$(call gb_ExternalProject_run,build,\
 		./configure --disable-shared --with-pic \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_DEBUG_CFLAGS) $(gb_COMPILEROPTFLAGS) \
 		$(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \
 		&& $(MAKE) \
diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk
index ac03a40..068d886 100644
--- a/external/libfreehand/ExternalProject_libfreehand.mk
+++ b/external/libfreehand/ExternalProject_libfreehand.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) :
 			--disable-debug \
 			--disable-werror \
 			--disable-weffc \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 		    $(if $(VERBOSE)$(verbose),V=1) \
 		    $(MAKE)) \
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk
index 1770815..fbf64bd 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
 		./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \
 		$(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \
 		$(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
-		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
+		$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
 		$(if $(SYSTEM_LIBXML),\
 			$(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)"), \
 			LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \
diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk
index 1a2c84e..a9edc00 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
 			--disable-werror \
 			--disable-weffc \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 			$(if $(VERBOSE)$(verbose),V=1) \
 			$(MAKE)) \
diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk
index 478dc7d..c69f321 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
 			--disable-debug \
 			--disable-werror \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 			$(if $(VERBOSE)$(verbose),V=1) \
 			$(MAKE)) \
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk
index dd31144..fc88a48 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
 			--disable-werror \
 			--disable-weffc \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src && \
 			$(if $(VERBOSE)$(verbose),V=1) \
 			$(MAKE)) \
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index d5776f0..1268a0d 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -95,7 +95,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 			$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
 			--disable-spreadsheet-model \
 			--disable-werror \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(SYSTEM_BOOST),,--with-boost-system=boostsystem) \
 		&& $(if $(VERBOSE)$(verbose),V=1) \
 		   $(MAKE) \
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index cbdea64..597ea93 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 			--disable-werror \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
 			$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 		    $(if $(VERBOSE)$(verbose),V=1) \
 		    $(MAKE)) \
diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk
index 86cf806..4d65938 100644
--- a/external/libwpd/ExternalProject_libwpd.mk
+++ b/external/libwpd/ExternalProject_libwpd.mk
@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
 			--without-docs \
 			--disable-debug \
 			$(if $(filter MACOSX,$(OS)),--disable-werror) \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(if $(VERBOSE)$(verbose),V=1) \
 		   $(MAKE) \
 	)
diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk
index ee8bad3..e8fafe7 100644
--- a/external/libwpg/ExternalProject_libwpg.mk
+++ b/external/libwpg/ExternalProject_libwpg.mk
@@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) :
 			--without-docs \
 			--disable-debug \
 			--disable-werror \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 		    $(if $(VERBOSE)$(verbose),V=1) \
 		    $(MAKE)) \
diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk
index 855c683..a1b1bac 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
 			--disable-debug \
 			--disable-werror \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 		    $(if $(VERBOSE)$(verbose),V=1) \
 		    $(MAKE)) \
diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk
index 5d8eba4..3f4cb2fd 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
 		./configure --disable-ipv6 --without-python --without-zlib \
 			--without-lzma \
 			--disable-static --without-debug lt_cv_cc_dll_switch="-shared" \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
 			LIBS="-lws2_32 $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
 			LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
@@ -42,7 +42,7 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
 		./configure --disable-ipv6 --without-python --without-zlib --with-sax1 \
 			--without-lzma \
 			$(if $(debug),--with-run-debug) \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \
 			LDFLAGS="$(if $(SYSBASE),-L$(SYSBASE)/usr/lib)" \
 			CFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(if $(debug),-g)" \
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index 06043ac..23eb7bc 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -58,7 +58,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 			$(if $(or $(filter-out ANDROID,$(OS)),$(DISABLE_OPENSSL)),--without-openssl,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(SYSTEM_LIBXML),,LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")\
 			$(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \
 			LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)) \
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk
index 3fd0b86..979ef57 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/external/libxslt/ExternalProject_xslt.mk
@@ -19,7 +19,7 @@ ifeq ($(COM),GCC)
 $(call gb_ExternalProject_get_state_target,xslt,build):
 	$(call gb_ExternalProject_run,build,\
 		./configure --without-crypto --without-python --disable-static \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
 			$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
 			LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
@@ -42,7 +42,7 @@ else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,xslt,build):
 	$(call gb_ExternalProject_run,build,\
 		./configure --without-crypto --without-python \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
 			$(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
diff --git a/external/mythes/ExternalProject_mythes.mk b/external/mythes/ExternalProject_mythes.mk
index 2428aa2..13ebb0a 100644
--- a/external/mythes/ExternalProject_mythes.mk
+++ b/external/mythes/ExternalProject_mythes.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,mythes,\
 $(call gb_ExternalProject_get_state_target,mythes,build):
 	$(call gb_ExternalProject_run,build,\
 		LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --with-pic \
-		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
+		$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
 		&& $(MAKE) \
 	)
 
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 5d630be..775ab55 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
 	$(call gb_ExternalProject_run,configure,\
 		$(if $(filter MSC,$(COM)),LIB="$(ILIB)") \
 		nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
 	,,nss_configure.log)
 
@@ -62,7 +62,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
 		$(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
 			$(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,NSS_USE_SYSTEM_SQLITE=1)) \
 		$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
-		$(if $(filter YES,$(CROSS_COMPILING)),\
+		$(if $(CROSS_COMPILING),\
 		$(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
 		NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \
 		NSDISTMODE=copy \
diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk
index 022dc0a..1b919f4 100644
--- a/external/openldap/ExternalProject_openldap.mk
+++ b/external/openldap/ExternalProject_openldap.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
 			--without-cyrus-sasl \
 			--disable-shared \
 			--enable-static \
-			$(if $(filter YES,$(CROSS_COMPILING)), \
+			$(if $(CROSS_COMPILING), \
 				--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 				--with-yielding_select=yes \
 				ac_cv_func_memcmp_working=yes \
diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk
index d1cfde8..2663184 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/poppler/ExternalProject_poppler.mk
@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,poppler,build) :
 			--disable-utils \
 			--disable-cms \
 			$(if $(filter WNT MACOSX,$(OS)),--with-font-configuration=win32,--with-font-configuration=fontconfig) \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
 
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk
index c89cebd..557dc48 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
 	$(call gb_ExternalProject_run,build,\
 		./configure \
 			--without-readline --disable-shared --with-ldap \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(DISABLE_OPENSSL),,--with-openssl \
 				$(if $(filter YES,$(WITH_KRB5)), --with-krb5) \
 				$(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi)) \
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index e07d897..0014d7f 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -59,7 +59,7 @@ endif
 $(call gb_ExternalProject_get_state_target,python3,build) :
 	$(call gb_ExternalProject_run,build,\
 		./configure \
-		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+		$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		$(if $(ENABLE_VALGRIND),--with-valgrind) \
 		--prefix=/python-inst \
 		$(if $(filter MACOSX,$(OS)),,--with-system-expat) \
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
index 49a1cdc..55dff12 100644
--- a/external/redland/ExternalProject_raptor.mk
+++ b/external/redland/ExternalProject_raptor.mk
@@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
 			 --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
 			--with-www=xml \
 			--without-xslt-config \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
 			$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk
index 35b46d3..f1b8d1c 100644
--- a/external/redland/ExternalProject_rasqal.mk
+++ b/external/redland/ExternalProject_rasqal.mk
@@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 			--with-decimal=none \
 			--with-uuid-library=internal \
 			--with-digest-library=internal \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
 			$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk
index 552d242..e643dbc 100644
--- a/external/redland/ExternalProject_redland.mk
+++ b/external/redland/ExternalProject_redland.mk
@@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 			--without-threads \
 			--without-bdb --without-sqlite --without-mysql \
 			--without-postgresql --without-threestone --without-virtuoso \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
 		&& $(MAKE) \
diff --git a/external/redland/UnpackedTarball_rasqal.mk b/external/redland/UnpackedTarball_rasqal.mk
index 0017fac..d49f47d 100644
--- a/external/redland/UnpackedTarball_rasqal.mk
+++ b/external/redland/UnpackedTarball_rasqal.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
 	$(if $(filter-out WNT,$(OS)),external/redland/rasqal/rasqal-bundled-soname.patch.1) \
 	$(if $(filter ANDROID,$(OS)),external/redland/rasqal/rasqal-android.patch.1) \
 	$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/rasqal/rasqal-mingw.patch.1) \
-	$(if $(filter YES,$(CROSS_COMPILING)),external/redland/rasqal/rasqal-xcompile.patch.1) \
+	$(if $(CROSS_COMPILING),external/redland/rasqal/rasqal-xcompile.patch.1) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/UnpackedTarball_redland.mk b/external/redland/UnpackedTarball_redland.mk
index 8fb1258..56a4fbd 100644
--- a/external/redland/UnpackedTarball_redland.mk
+++ b/external/redland/UnpackedTarball_redland.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,redland,\
 	$(if $(filter-out WNT,$(OS)),external/redland/redland/redland-bundled-soname.patch.1) \
 	$(if $(filter ANDROID,$(OS)),external/redland/redland/redland-android.patch.1) \
 	$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/redland/redland-mingw.patch.1) \
-	$(if $(filter YES,$(CROSS_COMPILING)),external/redland/redland/redland-xcompile.patch.1) \
+	$(if $(CROSS_COMPILING),external/redland/redland/redland-xcompile.patch.1) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 237947d..ab8406f 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -189,7 +189,7 @@ sub run {
     # Checking version of makecab.exe
     ##############################################
 
-    if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) || $ENV{'CROSS_COMPILING'} ne 'YES' || $installer::globals::packageformat eq 'msi')) { installer::control::check_makecab_version(); }
+    if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) || $ENV{'CROSS_COMPILING'} ne 'TRUE' || $installer::globals::packageformat eq 'msi')) { installer::control::check_makecab_version(); }
 
     ##########################################################
     # Getting the include path from the settings in zip list
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index caa9f52..1076c8f 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -70,7 +70,7 @@ sub check_system_path
     # All platforms: zip
     # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging
 
-    if ($ENV{'CROSS_COMPILING'} eq 'YES')
+    if ($ENV{'CROSS_COMPILING'} eq 'TRUE')
     {
         # we build our own msi* etc. tools when cross-compiling
         $ENV{'PATH'} .= $installer::globals::pathseparator . $ENV{'WORKDIR_FOR_BUILD'} . '/LinkTarget/Executable';
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 4a97a1a..8967113 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-ifeq ($(CROSS_COMPILING),YES)
+ifneq ($(CROSS_COMPILING),)
 gb_Module_add_targets_for_build :=
 gb_Module_SKIPTARGETS := check slowcheck subsequentcheck
 endif
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index 485a575..1e0f72c 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_l10n_targets,svtools,\
     UIConfig_svt \
 ))
 
-ifneq ($(CROSS_COMPILING),YES)
+ifeq ($(CROSS_COMPILING),)
 
 ifneq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,svtools,\
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index dd35012..9ffb252 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,testtools))
 
-ifneq ($(CROSS_COMPILING),YES)
+ifeq ($(CROSS_COMPILING),)
 
 $(eval $(call gb_Module_add_targets,testtools,\
 	CustomTarget_bridgetest \
