fix vcl with Library_merged

Change-Id: Ie85ba53c59eda5586b70527a518e3f80223fc49e

Library_merged.mk

@@ -103,9 +103,6 @@ $(eval $(call gb_Library_add_libs,merged,\
 	-lSM \
 	-lICE \
 ))
-$(eval $(call gb_Library_use_static_libraries,merged,\
-	headless \
-))
 endif
 
 ifeq ($(OS),LINUX)

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -129,7 +129,6 @@ gb_MERGEDLIBS := \
 	uui \
 	$(if $(DISABLE_SCRIPTING),,vbahelper) \
 	vcl \
-	$(if $(filter unx,$(GUIBASE)),vclplug_svp) \
 	$(if $(filter-out IOS,$(OS)),wpftdraw) \
 	$(if $(filter-out IOS,$(OS)),wpftwriter) \
 	writerfilter \

vcl/unx/generic/plugadapt/salplug.cxx

@@ -118,7 +118,11 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
 static DesktopType get_desktop_environment()
 {
     OUStringBuffer aModName( 128 );
-    aModName.appendAscii( SAL_DLLPREFIX"desktop_detector" );
+    #ifdef LIBO_MERGELIBS
+        aModName.appendAscii( SAL_DLLPREFIX"merged" );
+    #else
+        aModName.appendAscii( SAL_DLLPREFIX"desktop_detector" );
+    #endif
     aModName.appendAscii( SAL_DLLPOSTFIX );
     OUString aModule = aModName.makeStringAndClear();