[Libreoffice-commits] core.git: vcl/unx

[Miklos Vajna]

 vcl/unx/generic/plugadapt/salplug.cxx |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 44019e1c9a6b2072c70de121d15ad477e38cacb8
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Tue Apr 2 17:45:27 2013 +0200

    vcl: don't try to dlopen kde plugins when kde support is disabled
    
    Change-Id: I01e19a9c7345e4a3489377ccb38c0465f8c88292

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index e8a2eeb..cbe5394 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -28,6 +28,7 @@
 #include "generic/gendata.hxx"
 #include "unx/desktops.hxx"
 #include "vcl/printerinfomanager.hxx"
+#include <config_vclplug.h>
 
 #include <cstdio>
 #include <unistd.h>
@@ -151,12 +152,25 @@ static SalInstance* autodetect_plugin()
 {
     static const char* pTDEFallbackList[] =
     {
-        "tde", "kde4", "kde", "gtk3", "gtk", "gen", 0
+        "tde",
+#if ENABLE_KDE4
+        "kde4",
+#endif
+#if ENABLE_KDE
+        "kde",
+#endif
+        "gtk3", "gtk", "gen", 0
     };
 
     static const char* pKDEFallbackList[] =
     {
-        "kde4", "kde", "gtk3", "gtk", "gen", 0
+#if ENABLE_KDE4
+        "kde4",
+#endif
+#if ENABLE_KDE
+        "kde",
+#endif
+        "gtk3", "gtk", "gen", 0
     };
 
     static const char* pStandardFallbackList[] =