RepositoryModule_ooo: add missing modules

Change-Id: I1c2702ccf7433eaec0403975d37f1dd35f63b260

RepositoryModule_ooo.mk

@@ -70,6 +70,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	embeddedobj \
 	embedserv \
 	eventattacher \
+	$(call gb_Helper_optional,EXPAT,expat) \
 	extensions \
 	extras \
 	fileaccess \
@@ -154,6 +155,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	slideshow \
 	smoketest \
 	solenv \
+	soltools \
 	sot \
 	starmath \
 	stoc \
@@ -200,6 +202,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	xmlscript \
 	xmlsecurity \
 	xsltml \
+	$(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
 # vim: set noet ts=4 sw=4:

zlib/Module_zlib.mk

@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-ifneq ($(SYSTEM_ZLIB),YES)
-
 $(eval $(call gb_Module_Module,zlib))
 
+ifeq ($(SYSTEM_ZLIB),NO)
+
 $(eval $(call gb_Module_add_targets,zlib,\
 	ExternalPackage_zlib \
 	StaticLibrary_zlib \