diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b2e13e55d1d7..6d358b7c0fb2 100644 --- a/configure.ac +++ b/configure.ac @@ -3860,6 +3860,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then else with_system_libgltf=no fi + if test "$with_system_hunspell" = "yes"; then + AC_MSG_ERROR([--with-system-hunspell conflicts with --enable-dbgutil]) + else + with_system_hunspell=no + fi else ENABLE_DBGUTIL="" MSVC_USE_DEBUG_RUNTIME="" @@ -9585,7 +9590,7 @@ if test "$with_system_hunspell" = "yes"; then HUNSPELL_LIBS=-lhunspell fi AC_LANG_POP([C++]) - libo_MINGW_CHECK_DLL([libhunspell-1.4]) + libo_MINGW_CHECK_DLL([libhunspell-1.6]) HUNSPELL_CFLAGS=$(printf '%s' "$HUNSPELL_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${HUNSPELL_LIBS}" HUNSPELL_LIBS="${filteredlibs}" @@ -9596,7 +9601,7 @@ else if test "$COM" = "MSC"; then HUNSPELL_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/hunspell.lib" else - HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs -lhunspell-1.4" + HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs -lhunspell-1.6" fi BUILD_TYPE="$BUILD_TYPE HUNSPELL" fi |