Add config_libraries.h definitions to get library names easily.

Works for libmerged too, so we can get rid of LIBO_MERGELIBS.
And remove few more #defines in vcl.

It's generated by gbuild, so probably abusing config_host directory.
Open to improvements.

Change-Id: I87ab109bf109e42751766011daf076e9cdf8f5ee

1 files changed, 8 insertions, 10 deletions

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 56d9fe525560..0fd81dc9ac18 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_libraries.h>
+
 #include "osl/module.h"
 #include "osl/process.h"
 
@@ -49,7 +51,11 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
     {
         return NULL;
     }
-    OUString aModule(SAL_DLLPREFIX "vclplug_" + rModuleBase + SAL_DLLPOSTFIX);
+    OUString aModule(
+#ifdef SAL_DLLPREFIX
+            SAL_DLLPREFIX
+#endif
+            "vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION );
 
     oslModule aMod = osl_loadModuleRelative(
         reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
@@ -111,15 +117,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
 
 static DesktopType get_desktop_environment()
 {
-    OUString aModule(
-        SAL_DLLPREFIX
-#if defined LIBO_MERGELIBS
-        "merged"
-#else
-        "desktop_detector"
-#endif
-        SAL_DLLPOSTFIX);
-
+    OUString aModule(LIBO_LIBRARY(desktop_detector));
     oslModule aMod = osl_loadModuleRelative(
         reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
         SAL_LOADMODULE_DEFAULT );