diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-04-02 17:45:27 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-02 17:49:26 +0200 |
| commit | 44019e1c9a6b2072c70de121d15ad477e38cacb8 (patch) | |
| tree | 1d70f1b96192cb35bb6316c510adc77e5fb55468 /vcl/unx/generic/plugadapt/salplug.cxx | |
| parent | fee628c8741d10b7e1ede9a0c20e26d8dbe3fa10 (diff) | |
vcl: don't try to dlopen kde plugins when kde support is disabled
Change-Id: I01e19a9c7345e4a3489377ccb38c0465f8c88292
Diffstat (limited to 'vcl/unx/generic/plugadapt/salplug.cxx')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index e8a2eeb5d233..cbe539420a05 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[] = |