fix libmerged: vclplug_svp is in

Change-Id: I6ab00275b36725fbb0a446c7e5eb888e034a8989

Library_merged.mk

@@ -30,6 +30,12 @@ $(eval $(call gb_Library_use_libraries,merged,\
 	$(gb_UWINAPI) \
 ))
 
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_use_static_libraries,merged,\
+	headless \
+))
+endif
+
 $(eval $(call gb_Library_use_externals,merged,\
 	icu_headers \
 	icui18n \

vcl/Library_vcl.mk

@@ -48,6 +48,7 @@ $(eval $(call gb_Library_add_defs,vcl,\
 	-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\" \
 	-DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,desktop_detector))\" \
 	-DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,tk))\" \
+	-DVCLPLUG_SVP_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,vclplug_svp))\" \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,vcl))

vcl/unx/generic/plugadapt/salplug.cxx

@@ -54,6 +54,9 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
             SAL_DLLPREFIX
 #endif
             "vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION );
+    // vclplug_svp is in libmerged
+    if (rModuleBase == "svp")
+        aModule = VCLPLUG_SVP_DLL_NAME;
 
     oslModule aMod = osl_loadModuleRelative(
         reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,