Add the ability to detect ispell lib directory

Check LIBDIR ispell compile option and use only it for ispell lib directory
if found.

Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit bbe1b42cbb)

CMakeLists.txt

@@ -1074,6 +1074,24 @@ if( WITH_GAMIN )
 endif( WITH_GAMIN )
 
 
+##### check for ispell ##########################
+
+if ( NOT ISPELL_LIBDIR )
+  find_program( ISPELL_EXECUTABLE NAMES ispell DOC "path to the ispell executable" )
+  if( ISPELL_EXECUTABLE )
+    execute_process (
+      COMMAND ${ISPELL_EXECUTABLE} -vv
+      COMMAND awk "$1 == \"LIBDIR\" && $2 == \"=\" {gsub(/\"/, \"\", $3); print $3;}"
+      OUTPUT_VARIABLE ISPELL_LIBDIR
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if ( ISPELL_LIBDIR )
+      set ( ISPELL_LIBDIR "${ISPELL_LIBDIR}" CACHE PATH "ispell lib directory contains dictionaries" )
+    else ( ISPELL_LIBDIR )
+      unset ( ISPELL_LIBDIR )
+    endif ( ISPELL_LIBDIR )
+  endif( ISPELL_EXECUTABLE )
+endif ( NOT ISPELL_LIBDIR )
+
 ##### check for aspell ##########################
 # we need ASPELL_DATADIR too
 

config.h.cmake

@@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
+/* Define where ispell libdir is */
+#cmakedefine ISPELL_LIBDIR "@ISPELL_LIBDIR@"
+
 /* Define where aspell data dir is */
 #define ASPELL_DATADIR "@ASPELL_DATADIR@"
 

kdeui/ksconfig.cpp

@@ -603,6 +603,9 @@ KSpellConfig::fillDicts( TQComboBox* box, TQStringList* dictionaries )
       box->insertItem( i18n("ISpell Default") );
 
       // dictionary path
+#ifdef ISPELL_LIBDIR
+      TQFileInfo dir (ISPELL_LIBDIR);
+#else
       TQFileInfo dir ("/usr/lib/ispell");
       if (!dir.exists() || !dir.isDir())
         dir.setFile ("/usr/local/lib/ispell");
@@ -617,6 +620,7 @@ KSpellConfig::fillDicts( TQComboBox* box, TQStringList* dictionaries )
        if (!dir.exists() || !dir.isDir())
        dir.setFile ("/usr/local/lib");
       */
+#endif
       if (!dir.exists() || !dir.isDir()) return;
 
       kdDebug(750) << "KSpellConfig::getAvailDictsIspell "

kspell2/plugins/ispell/ispell_checker.cpp

@@ -55,6 +55,9 @@ typedef struct str_ispell_map
 } IspellMap;
 
 static const char *ispell_dirs [] = {
+#ifdef ISPELL_LIBDIR
+	ISPELL_LIBDIR,
+#else
 	"/usr/" SYSTEM_LIBDIR "/ispell",
 	"/usr/lib/ispell",
 	"/usr/local/" SYSTEM_LIBDIR "/ispell",
@@ -62,6 +65,7 @@ static const char *ispell_dirs [] = {
 	"/usr/local/share/ispell",
 	"/usr/share/ispell",
 	"/usr/pkg/lib",
+#endif
 	0
 };
 static const IspellMap ispell_map [] = {