From 1435670790f42de9bbf7792d396bb4ef6950e476 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Tue, 12 Sep 2006 00:54:07 +0000 Subject: [PATCH] Add defines needed on cygwin * configure.ac: define BOOST_POSIX_API and BOOST_POSIX_PATH on cygwin (needed by boost 1.34). * development/scons/SConstruct: ditto. * development/cmake/config.h.cmake: ditto. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14980 a592a061-630c-0410-9148-cb99ea01b6c8 --- configure.ac | 2 ++ development/cmake/config.h.cmake | 4 +++- development/scons/SConstruct | 10 +++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5d1bbb19f7..c2c89c2aba 100644 --- a/configure.ac +++ b/configure.ac @@ -404,6 +404,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) diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake index 4fd101b168..eb0ec2469f 100644 --- a/development/cmake/config.h.cmake +++ b/development/cmake/config.h.cmake @@ -136,6 +136,8 @@ #ifdef __CYGWIN__ # define BOOST_POSIX 1 +# define BOOST_POSIX_API 1 +# define BOOST_POSIX_PATH 1 #endif #if defined(HAVE_NEWAPIS_H) @@ -151,4 +153,4 @@ -#endif \ No newline at end of file +#endif diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 49edb08738..e52c9e9ec5 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -931,6 +931,8 @@ if not fast_start or not os.path.isfile(boost_config_h) \ #ifdef __CYGWIN__ # define BOOST_POSIX 1 +# define BOOST_POSIX_API 1 +# define BOOST_POSIX_PATH 1 #endif #define BOOST_ALL_NO_LIB 1 @@ -1105,7 +1107,13 @@ int count() 'libstdc++ pedantic debug mode' ), (os.name != 'nt', 'BOOST_POSIX', - 'Indicates to boost which API to use (posix or windows).' + 'Indicates to boost < 1.34 which API to use (posix or windows).' + ), + (os.name != 'nt', 'BOOST_POSIX_API', + 'Indicates to boost 1.34 which API to use (posix or windows).' + ), + (os.name != 'nt', 'BOOST_POSIX_PATH', + 'Indicates to boost 1.34 which path style to use (posix or windows).' ), (spell_engine is not None, spell_engine, 'Spell engine to use'