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

small changes after windows aspell support port

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-10-13 12:58:05 +02:00
parent 6c5440ff7b
commit 3484451d46
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -216,6 +216,8 @@ utils/copyfile.cpp \
utils/copyfile.h \ utils/copyfile.h \
utils/cpuconf.cpp \ utils/cpuconf.cpp \
utils/cpuconf.h \ utils/cpuconf.h \
utils/dlib.cpp \
utils/dlib.h \
utils/ecrontab.cpp \ utils/ecrontab.cpp \
utils/ecrontab.h \ utils/ecrontab.h \
utils/execmd.cpp \ utils/execmd.cpp \

10
src/aspell/rclaspell.cpp
View File

@ -423,10 +423,14 @@ bool Aspell::make_speller(string& reason)
aapi.aspell_config_replace(config, "encoding", "utf-8"); aapi.aspell_config_replace(config, "encoding", "utf-8");
aapi.aspell_config_replace(config, "master", dicPath().c_str()); aapi.aspell_config_replace(config, "master", dicPath().c_str());
aapi.aspell_config_replace(config, "sug-mode", "fast"); aapi.aspell_config_replace(config, "sug-mode", "fast");
#ifdef _WIN32
aapi.aspell_config_replace(config, "data-dir", m_data->m_datadir.c_str()); aapi.aspell_config_replace(config, "data-dir", m_data->m_datadir.c_str());
aapi.aspell_config_replace( #endif
config, "local-data-dir", if (m_data->m_addCreateParam.size() > ldatadiroptsz) {
m_data->m_addCreateParam.substr(ldatadiroptsz).c_str()); aapi.aspell_config_replace(
config, "local-data-dir",
m_data->m_addCreateParam.substr(ldatadiroptsz).c_str());
}
// aapi.aspell_config_replace(config, "sug-edit-dist", "2"); // aapi.aspell_config_replace(config, "sug-edit-dist", "2");
ret = aapi.new_aspell_speller(config); ret = aapi.new_aspell_speller(config);
aapi.delete_aspell_config(config); aapi.delete_aspell_config(config);

6
src/common/autoconfig.h.in
View File

@ -24,6 +24,9 @@
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H #undef HAVE_DLFCN_H
/* dlopen function is available */
#undef HAVE_DLOPEN
/* Define if you have the iconv() function and it works. */ /* Define if you have the iconv() function and it works. */
#undef HAVE_ICONV #undef HAVE_ICONV
@ -36,9 +39,6 @@
/* Define to 1 if you have the `chm' library (-lchm). */ /* Define to 1 if you have the `chm' library (-lchm). */
#undef HAVE_LIBCHM #undef HAVE_LIBCHM
/* Define to 1 if you have the `dl' library (-ldl). */
#undef HAVE_LIBDL
/* Define to 1 if you have the `pthread' library (-lpthread). */ /* Define to 1 if you have the `pthread' library (-lpthread). */
#undef HAVE_LIBPTHREAD #undef HAVE_LIBPTHREAD

5
src/configure.ac
View File

@ -267,7 +267,10 @@ AM_CONDITIONAL(MAKEPYTHONCHM, [test X$pythonChmEnabled = Xyes])
AC_CHECK_FUNCS(mkdtemp) AC_CHECK_FUNCS(mkdtemp)
AC_CHECK_LIB([pthread], [pthread_create], [], []) AC_CHECK_LIB([pthread], [pthread_create], [], [])
AC_CHECK_LIB([dl], [dlopen], [], []) AC_SEARCH_LIBS([dlopen], [dl], [], [])
if test X$ac_cv_search_function != Xno ; then
AC_DEFINE(HAVE_DLOPEN, 1, [dlopen function is available])
fi
AC_CHECK_LIB([z], [zlibVersion], [], []) AC_CHECK_LIB([z], [zlibVersion], [], [])
############# Putenv ############# Putenv