Scons: fix substFile dependence problems

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5d1bbb19f75f82514fcb9996a2345ad83ee6e4e0..5bcbe727e643d1eae769c985a7af8fb5a958d104 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,9 @@ AC_SUBST(AIKSAURUS_LIBS)
 
 LYX_USE_INCLUDED_BOOST
 
+# Needed for our char_type
+AC_CHECK_SIZEOF(wchar_t)
+
 ### Setup libtool
 dnl Dirty trick ahead: disable libtool checking for a fortran compiler
 dnl see http://permalink.gmane.org/gmane.comp.gnu.libtool.general/6699
@@ -385,7 +388,7 @@ int mkstemp(char*);
 #endif
 #endif
 
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
+#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM) && !defined(__CYGWIN__)
 #  define USE_BOOST_FORMAT 1
 #else
 #  define USE_BOOST_FORMAT 0
@@ -404,6 +407,8 @@ int mkstemp(char*);
 
 #ifdef __CYGWIN__
 #  define BOOST_POSIX 1
+#  define BOOST_POSIX_API 1
+#  define BOOST_POSIX_PATH 1
 #endif
 
 #if defined(HAVE_NEWAPIS_H)