tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

look for the aspell command in the PATH if not in the configured place

Browse Source
This commit is contained in:
Jean-Francois Dockes 2011-04-29 15:33:09 +02:00
parent 7d2928022c
commit eacf71bf99
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/aspell/rclaspell.cpp
View File

@ -67,14 +67,6 @@ static AspellApi aapi;
badnames += #NM + string(" "); \ badnames += #NM + string(" "); \
} }
static const char *aspell_progs[] = {
#ifdef ASPELL_PROG
ASPELL_PROG ,
#endif
"/usr/local/bin/aspell",
"/usr/bin/aspell"
};
static const unsigned int naspellprogs = sizeof(aspell_progs) / sizeof(char*);
static const char *aspell_lib_suffixes[] = { static const char *aspell_lib_suffixes[] = {
".so", ".so",
".so.15", ".so.15",
@ -137,12 +129,18 @@ bool Aspell::init(string &reason)
} }
m_data = new AspellData; m_data = new AspellData;
for (unsigned int i = 0; i < naspellprogs; i++) {
if (access(aspell_progs[i], X_OK) == 0) { const char *aspell_prog_from_env = getenv("ASPELL_PROG");
m_data->m_exec = aspell_progs[i]; if (aspell_prog_from_env && access(aspell_prog_from_env, X_OK) == 0) {
break; m_data->m_exec = aspell_prog_from_env;
} #ifdef ASPELL_PROG
} else if (access(ASPELL_PROG, X_OK) == 0) {
m_data->m_exec = ASPELL_PROG;
#endif // ASPELL_PROG
} else {
ExecCmd::which("aspell", m_data->m_exec);
} }
if (m_data->m_exec.empty()) { if (m_data->m_exec.empty()) {
reason = "aspell program not found or not executable"; reason = "aspell program not found or not executable";
deleteZ(m_data); deleteZ(m_data);
@ -153,9 +151,8 @@ bool Aspell::init(string &reason)
// be clever with ASPELL_PROG. // be clever with ASPELL_PROG.
vector<string> libdirs; vector<string> libdirs;
libdirs.push_back(LIBDIR); libdirs.push_back(LIBDIR);
#ifdef ASPELL_PROG // If not in the standard place, the aspell library has to live
// The aspell library has to live under the same prefix as the // under the same prefix as the aspell program.
// aspell program.
{ {
string aspellPrefix = path_getfather(path_getfather(m_data->m_exec)); string aspellPrefix = path_getfather(path_getfather(m_data->m_exec));
// This would probably require some more tweaking on solaris/irix etc. // This would probably require some more tweaking on solaris/irix etc.
@ -164,7 +161,6 @@ bool Aspell::init(string &reason)
if (libaspell != LIBDIR) if (libaspell != LIBDIR)
libdirs.push_back(libaspell); libdirs.push_back(libaspell);
} }
#endif
reason = "Could not open shared library "; reason = "Could not open shared library ";
for (vector<string>::iterator it = libdirs.begin(); for (vector<string>::iterator it = libdirs.begin();