anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-13 22:49:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Automake build: We are using 3rdparty iconv with version 1.15

Browse Source
This commit is contained in:
Kornel Benko 2020-11-17 23:07:01 +01:00
parent 875b1def4f
commit 042128b643
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/lyxinclude.m4
View File

@ -539,7 +539,7 @@ dnl Some bits from libiconv configure.ac to avoid a nested configure call:
AC_EILSEQ AC_EILSEQ
AC_TYPE_MBSTATE_T AC_TYPE_MBSTATE_T
AC_CHECK_FUNCS([getc_unlocked mbrtowc wcrtomb mbsinit setlocale]) AC_CHECK_FUNCS([getc_unlocked mbrtowc wcrtomb mbsinit setlocale])
dnl Ymbstate_t is used if HAVE_WCRTOMB || HAVE_MBRTOWC, see 3rdparty/libiconv/1.14/lib/loop_wchar.h. dnl Ymbstate_t is used if HAVE_WCRTOMB || HAVE_MBRTOWC, see 3rdparty/libiconv/1.15/lib/loop_wchar.h.
if test $ac_cv_func_wcrtomb = yes || test $ac_cv_func_mbrtowc = yes; then if test $ac_cv_func_wcrtomb = yes || test $ac_cv_func_mbrtowc = yes; then
USE_MBSTATE_T=1 USE_MBSTATE_T=1
else else
@ -569,9 +569,9 @@ dnl we want const correctness
dnl we build a static lib dnl we build a static lib
DLL_VARIABLE= DLL_VARIABLE=
AC_SUBST([DLL_VARIABLE]) AC_SUBST([DLL_VARIABLE])
ICONV_INCLUDES='-I$(top_srcdir)/3rdparty/libiconv/1.14 -I$(top_builddir)/3rdparty/libiconv' ICONV_INCLUDES='-I$(top_srcdir)/3rdparty/libiconv/1.15 -I$(top_builddir)/3rdparty/libiconv'
ICONV_LIBS='\$(top_builddir)/3rdparty/libiconv/liblyxiconv.a' ICONV_LIBS='\$(top_builddir)/3rdparty/libiconv/liblyxiconv.a'
ICONV_ICONV_H_IN=3rdparty/libiconv/iconv.h:3rdparty/libiconv/1.14/include/iconv.h.in ICONV_ICONV_H_IN=3rdparty/libiconv/iconv.h:3rdparty/libiconv/1.15/include/iconv.h.in
else else
ICONV_INCLUDES= ICONV_INCLUDES=
AM_ICONV AM_ICONV