anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation of included libiconv with autoconf

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2020-11-19 13:40:26 +01:00
parent 031720b66a
commit b5d1f2f300
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/libiconv/Makefile.am vendored
View File

@ -33,7 +33,7 @@ EXTRA_DIST = \
1.15/libcharset/lib/ref-add.sin \ 1.15/libcharset/lib/ref-add.sin \
1.15/libcharset/lib/ref-del.sin 1.15/libcharset/lib/ref-del.sin
AM_CPPFLAGS += -I$(srcdir)/1.15/srclib -DLIBDIR="" AM_CPPFLAGS += -I$(srcdir)/1.15/srclib -DLIBDIR=\"\"
# The two relocatable.c files confuse automake < 1.14, where we do not use # The two relocatable.c files confuse automake < 1.14, where we do not use
# subdir-objects. Therefore we cannot put both in liblyxiconv_a_SOURCES # subdir-objects. Therefore we cannot put both in liblyxiconv_a_SOURCES

3
config/lyxinclude.m4
View File

@ -535,6 +535,9 @@ AC_DEFUN([LYX_USE_INCLUDED_ICONV],[
if test x$lyx_cv_with_included_iconv = xyes ; then if test x$lyx_cv_with_included_iconv = xyes ; then
lyx_included_libs="$lyx_included_libs iconv" lyx_included_libs="$lyx_included_libs iconv"
dnl This is hardcoded to make it compile
AC_DEFINE([HAVE_WORKING_O_NOFOLLOW], 0, [Define to 1 if O_NOFOLLOW works.])
dnl Some bits from libiconv configure.ac to avoid a nested configure call: 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