X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=268c501dea4cd973e691d0bc123501bd2e96aa6b;hb=8dfe07b5b54e5ba4147545407cdc1f422e753861;hp=40cf17373c192c83c7cf18cf0526cc17d0168d55;hpb=ce526607ff4ae33834dabe64e0072530eca16183;p=lyx.git

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 40cf17373c..268c501dea 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -164,9 +164,9 @@ fi
 ])
 
 
-dnl Usage: LYX_CXX_CXX11_FLAGS: add to AM_CXXFLAGS the best flag that
+dnl Usage: LYX_CXX_CXX11_FLAGS(VERSION): add to AM_CXXFLAGS the best flag that
 dnl selects C++11 mode; gives an error when C++11 mode is not found.
-dnl Parameter is a list of years to try (e.g. 11 or {14,11})
+dnl VERSION is a list of years to try (e.g. 11 or {14,11}).
 AC_DEFUN([LYX_CXX_CXX11_FLAGS],
 [AC_CACHE_CHECK([for a good C++ mode], [lyx_cv_cxx11_flags],
  [lyx_cv_cxx11_flags=none
@@ -308,10 +308,10 @@ AC_DEFUN([LYX_PROG_CXX],
 [AC_REQUIRE([AC_PROG_CXX])
 AC_REQUIRE([AC_PROG_CXXCPP])
 
-### We might want to disable debug
+### We might want to force the C++ standard.
 AC_ARG_ENABLE(cxx-mode,
   AS_HELP_STRING([--enable-cxx-mode],[choose C++ standard (default: 14, then 11)]),,
-  [enable_cxx_mode=14,11]
+  [enable_cxx_mode={14,11}]
 )
 
 AC_LANG_PUSH(C++)
@@ -535,11 +535,14 @@ 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
     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
       USE_MBSTATE_T=1
     else
@@ -569,9 +572,9 @@ dnl we want const correctness
 dnl we build a static lib
     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_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
     ICONV_INCLUDES=
     AM_ICONV