normalize values of SYSTEM_CLUCENE, SYSTEM_EXPAT, SYSTEM_JPEG

Change-Id: I343dae79b01e1369722c7bbd1ab2c36e2bfa96ac

RepositoryExternal.mk

@@ -404,7 +404,7 @@ endef
 endif # SYSTEM_ZLIB
 
 
-ifeq ($(SYSTEM_JPEG),YES)
+ifneq ($(SYSTEM_JPEG),)
 
 define gb_LinkTarget__use_jpeg
 $(call gb_LinkTarget_add_libs,$(1),-ljpeg)
@@ -463,7 +463,7 @@ endef
 endif # SYSTEM_MYTHES
 
 
-ifeq ($(SYSTEM_EXPAT),YES)
+ifneq ($(SYSTEM_EXPAT),)
 
 define gb_LinkTarget__use_expat_impl
 $(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter))
@@ -2184,7 +2184,7 @@ endef
 endif # SYSTEM_POPPLER
 
 
-ifeq ($(SYSTEM_CLUCENE),YES)
+ifneq ($(SYSTEM_CLUCENE),)
 
 define gb_LinkTarget__use_clucene
 $(call gb_LinkTarget_add_defs,$(1),\

configure.ac

@@ -7700,7 +7700,7 @@ fi
 
 if test "$with_system_jpeg" = "yes"; then
     AC_MSG_RESULT([external])
-    SYSTEM_JPEG=YES
+    SYSTEM_JPEG=TRUE
     AC_CHECK_HEADER(jpeglib.h, [],
         [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
     AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
@@ -7708,7 +7708,7 @@ if test "$with_system_jpeg" = "yes"; then
     libo_MINGW_CHECK_DLL([libjpeg])
 else
     AC_MSG_RESULT([internal])
-    SYSTEM_JPEG=NO
+    SYSTEM_JPEG=
     BUILD_TYPE="$BUILD_TYPE JPEG"
 fi
 AC_SUBST(SYSTEM_JPEG)
@@ -7723,7 +7723,7 @@ dnl but the contribs-lib check seems tricky
 AC_MSG_CHECKING([which clucene to use])
 if test "$with_system_clucene" = "yes"; then
     AC_MSG_RESULT([external])
-    SYSTEM_CLUCENE=YES
+    SYSTEM_CLUCENE=TRUE
     PKG_CHECK_MODULES(CLUCENE, libclucene-core)
     CLUCENE_CFLAGS=[$(printf '%s' "$CLUCENE_CFLAGS" | sed -e 's@-I[^ ]*/CLucene/ext@@' -e "s/-I/${ISYSTEM?}/g")]
     AC_LANG_PUSH([C++])
@@ -7742,7 +7742,7 @@ if test "$with_system_clucene" = "yes"; then
     CLUCENE_LIBS="$CLUCENE_LIBS -lclucene-contribs-lib"
 else
     AC_MSG_RESULT([internal])
-    SYSTEM_CLUCENE=NO
+    SYSTEM_CLUCENE=
     BUILD_TYPE="$BUILD_TYPE CLUCENE"
 fi
 AC_SUBST(SYSTEM_CLUCENE)
@@ -7757,7 +7757,7 @@ dnl proper pkg-config for it. It should really be fixed on the tinderbox though.
 AC_MSG_CHECKING([which expat to use])
 if test "$with_system_expat" = "yes"; then
     AC_MSG_RESULT([external])
-    SYSTEM_EXPAT=YES
+    SYSTEM_EXPAT=TRUE
     AC_CHECK_HEADER(expat.h, [],
         [AC_MSG_ERROR(expat.h not found. install expat)], [])
     AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
@@ -7765,7 +7765,7 @@ if test "$with_system_expat" = "yes"; then
     libo_MINGW_CHECK_DLL([libexpat])
 else
     AC_MSG_RESULT([internal])
-    SYSTEM_EXPAT=NO
+    SYSTEM_EXPAT=
     BUILD_TYPE="$BUILD_TYPE EXPAT"
 fi
 AC_SUBST(SYSTEM_EXPAT)

external/jpeg/Module_jpeg.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,jpeg))
 
-ifeq ($(SYSTEM_JPEG),NO)
+ifeq ($(SYSTEM_JPEG),)
 
 $(eval $(call gb_Module_add_targets,jpeg,\
     UnpackedTarball_jpeg \

external/python3/ExternalProject_python3.mk

@@ -75,13 +75,13 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 		CC="$(strip $(CC) \
 			$(if $(SYSTEM_OPENSSL),,-I$(call gb_UnpackedTarball_get_dir,openssl)/include \
 				$(if $(DISABLE_OPENSSL),,-I$(call gb_UnpackedTarball_get_dir,openssl)/include)) \
-			$(if $(filter NO,$(SYSTEM_EXPAT)),-I$(call gb_UnpackedTarball_get_dir,expat)/lib) \
+			$(if $(SYSTEM_EXPAT),,-I$(call gb_UnpackedTarball_get_dir,expat)/lib) \
 			$(if $(SYSBASE), -I$(SYSBASE)/usr/include) \
 			)" \
 		$(if $(python3_cflags),CFLAGS='$(python3_cflags)') \
 		LDFLAGS="$(strip $(LDFLAGS) \
 			$(if $(SYSTEM_OPENSSL),,-L$(call gb_UnpackedTarball_get_dir,openssl)) \
-			$(if $(filter YES,$(SYSTEM_EXPAT)),, -L$(gb_StaticLibrary_WORKDIR)) \
+			$(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \
 			$(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \
 			$(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \
 				$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \