diff options
| author | OBATA Akio <obache@wizdas.com> | 2020-08-19 14:00:20 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-09-27 19:06:55 +0200 |
| commit | bbe1b42cbbc7293041a83b154f969792a2592510 (patch) | |
| tree | 7b70d04adacaacf071f7db37cb7f9e4915916d96 | |
| parent | 2706c5674eb1ea3fffdca4d8c3edb3b25335e731 (diff) | |
| download | tdelibs-bbe1b42c.tar.gz tdelibs-bbe1b42c.zip | |
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>
| -rw-r--r-- | CMakeLists.txt | 18 | ||||
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | tdespell2/plugins/ispell/ispell_checker.cpp | 4 | ||||
| -rw-r--r-- | tdeui/ksconfig.cpp | 4 |
4 files changed, 29 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d809d29e..794c2afbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1206,6 +1206,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 diff --git a/config.h.cmake b/config.h.cmake index 4549fd14d..3e4a0e27c 100644 --- a/config.h.cmake +++ b/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@" diff --git a/tdespell2/plugins/ispell/ispell_checker.cpp b/tdespell2/plugins/ispell/ispell_checker.cpp index d21b8374b..d3dd324d3 100644 --- a/tdespell2/plugins/ispell/ispell_checker.cpp +++ b/tdespell2/plugins/ispell/ispell_checker.cpp @@ -54,6 +54,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", @@ -61,6 +64,7 @@ static const char *ispell_dirs [] = { "/usr/local/share/ispell", "/usr/share/ispell", "/usr/pkg/lib", +#endif 0 }; static const IspellMap ispell_map [] = { diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index 6ae9e3d5f..c814fec5c 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/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 " |