Revert "do not merge public ure libraries"

Does not work because cppuhelper depends on private libraries.
So, either by setting URELIBS we break API or can't merge that much or
need to think about it more and implement something clever.

This reverts commit 75ece7ac.

Repository.mk

@@ -431,7 +431,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \
 	$(if $(SOLAR_JAVA),sunjavaplugin) \
 	unoidl \
 	unsafe_uno \
-	$(if $(MERGELIBS),urelibs) \
+	$(if $(URELIBS),urelibs) \
 	xmlreader \
 	$(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
 ))

RepositoryModule_host.mk

@@ -240,7 +240,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 ifneq ($(MERGELIBS),)
 $(eval $(call gb_Module_add_targets,libreoffice,\
 	Library_merged \
-	Library_urelibs \
+	$(if $(URELIBS),Library_urelibs) \
 ))
 endif
 

config_host.mk.in

@@ -536,6 +536,7 @@ export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
 export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@
 export UNOWINREG_DLL=@UNOWINREG_DLL@
 export UPD=@UPD@
+export URELIBS=@URELIBS@
 export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@
 export USE_XINERAMA=@USE_XINERAMA@
 export use_shl_version=@use_shl_version@

configure.ac

@@ -11723,6 +11723,7 @@ if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then
     fi
     if test "$enable_mergelibs" = "all"; then
         MERGELIBS="ALL"
+        URELIBS="TRUE"
     else
         MERGELIBS="CORE"
     fi
@@ -11731,6 +11732,7 @@ else
     AC_MSG_RESULT([no])
 fi
 AC_SUBST([MERGELIBS])
+AC_SUBST([URELIBS])
 
 # ===================================================================
 # Create hardlinks on deliver instead of copying for smaller size and speed up

desktop/Pagein_common.mk

@@ -30,7 +30,7 @@ $(eval $(call gb_Pagein_Pagein,common))
 # sorted in approx. reverse load order (ld.so.1)
 $(eval $(call gb_Pagein_add_objects,common,\
     $(if $(MERGELIBS),merged) \
-    $(if $(MERGELIBS),urelibs) \
+    $(if $(URELIBS),urelibs) \
     i18nlangtag \
     $(if $(findstring YES,$(SYSTEM_ICU)),,\
         icui18n \

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -179,20 +179,21 @@ gb_MERGEDLIBS := \
 	xstor \
 	$(if $(filter ALL,$(MERGELIBS)),$(gb_EXTRAMERGEDLIBS))
 
+ifneq (,$(URELIBS))
 gb_URELIBS := \
+	cppu \
+	cppuhelper \
 	$(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \
 	$(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \
+	purpenvhelper \
 	reg \
+	sal \
+	salhelper \
 	store \
 	unoidl \
-	xmlreader \
-	$(if $(filter ALL,$(MERGELIBS)), \
-		cppu \
-		cppuhelper \
-		purpenvhelper \
-		sal \
-		salhelper \
-	)
+	xmlreader
+
+endif
 
 endif