From 33c3818ac59fda3a00b7cff19fd3b1f09296fe5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 23 Feb 2019 16:35:21 +0100
Subject: Use system libdir when searching for dynamically loaded libraries.
 This prevents finding an incorrect architecture on multi-arch systems.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8a859540c3cb306844288144a06028dc302408d6)
---
 tdespell2/plugins/ispell/CMakeLists.txt     | 1 +
 tdespell2/plugins/ispell/ispell_checker.cpp | 4 ++++
 2 files changed, 5 insertions(+)

(limited to 'tdespell2/plugins/ispell')

diff --git a/tdespell2/plugins/ispell/CMakeLists.txt b/tdespell2/plugins/ispell/CMakeLists.txt
index c8e5a4ec6..62b12a1a1 100644
--- a/tdespell2/plugins/ispell/CMakeLists.txt
+++ b/tdespell2/plugins/ispell/CMakeLists.txt
@@ -12,6 +12,7 @@
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdespell2
   ${CMAKE_SOURCE_DIR}/tdecore
diff --git a/tdespell2/plugins/ispell/ispell_checker.cpp b/tdespell2/plugins/ispell/ispell_checker.cpp
index c07d9a55f..387997444 100644
--- a/tdespell2/plugins/ispell/ispell_checker.cpp
+++ b/tdespell2/plugins/ispell/ispell_checker.cpp
@@ -29,6 +29,8 @@
  * do so, delete this exception statement from your version.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -53,7 +55,9 @@ typedef struct str_ispell_map
 } IspellMap;
 
 static const char *ispell_dirs [] = {
+	"/usr/" SYSTEM_LIBDIR "/ispell",
 	"/usr/lib/ispell",
+	"/usr/local/" SYSTEM_LIBDIR "/ispell",
 	"/usr/local/lib/ispell",
 	"/usr/local/share/ispell",
 	"/usr/share/ispell",
-- 
cgit v1.2.1