desktop_detector is also a vcl plugin

Change-Id: I71445c16744674f75fed190911749f38226169e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126715
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

Repository.mk

@@ -363,7 +363,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	dbtools \
 	deploymentmisc \
 	$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
-	$(if $(USING_X11),desktop_detector) \
 	$(call gb_Helper_optional,SCRIPTING,dlgprov) \
 	$(if $(filter WNT,$(OS)),directx9canvas) \
 	$(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \
@@ -486,6 +485,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 $(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,ooo, \
     acc \
     cui \
+    $(if $(USING_X11),desktop_detector) \
     icg \
     sdui \
     $(if $(USING_X11),vclplug_gen) \

vcl/Library_desktop_detector.mk

@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,desktop_detector))
 
+$(eval $(call gb_Library_set_plugin_for,desktop_detector,vcl))
+
 $(eval $(call gb_Library_set_include,desktop_detector,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
@@ -31,7 +33,6 @@ $(eval $(call gb_Library_add_defs,desktop_detector,\
 $(eval $(call gb_Library_use_sdk_api,desktop_detector))
 
 $(eval $(call gb_Library_use_libraries,desktop_detector,\
-    vcl \
     tl \
     utl \
     sot \

vcl/source/app/salplug.cxx

@@ -140,6 +140,8 @@ SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = false )
 #ifdef DESKTOPDETECT
 #ifndef DISABLE_DYNLOADING
 extern "C" typedef DesktopType Fn_get_desktop_environment();
+#else
+extern "C" DesktopType get_desktop_environment();
 #endif
 
 DesktopType lcl_get_desktop_environment()