commit b5d1f2f3002c22db64fda4eb40220a1dc0b43903
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Thu Nov 19 13:40:26 2020 +0100
Fix compilation of included libiconv with autoconf
---
3rdparty/libiconv/Makefile.am | 2 +-
config/lyxinclude.m4 | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/3rdparty/libiconv/Makefile.am b/3rdparty/libiconv/Makefile.am
index e9b8b51..2242412 100644
--- a/3rdparty/libiconv/Makefile.am
+++ b/3rdparty/libiconv/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = \
1.15/libcharset/lib/ref-add.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
# subdir-objects. Therefore we cannot put both in liblyxiconv_a_SOURCES
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index bffded3..268c501 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -535,6 +535,9 @@ AC_DEFUN([LYX_USE_INCLUDED_ICONV],[
if test x$lyx_cv_with_included_iconv = xyes ; then
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:
AC_EILSEQ
AC_TYPE_MBSTATE_T
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
