Fix compilation of included libiconv with autoconf

diff --git a/3rdparty/libiconv/Makefile.am b/3rdparty/libiconv/Makefile.am
index e9b8b514749c15acb685de67f0097fc2082a9b77..224241244e10308ceb4a5fa8dd636e93245689e5 100644 (file)
--- 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 bffded3ae49ba8102cfb80768f9fe2400f95eab3..268c501dea4cd973e691d0bc123501bd2e96aa6b 100644 (file)
--- 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