On Mon, Sep 11, 2006 at 11:09:52PM +0000, Angus Leeming wrote:
> Enrico Forestieri <[EMAIL PROTECTED]> writes:
> > This is due to the fact that boost 1.34 defaults to windows paths and
> > API even on cygwin. The attached patch fixes this problem. I am going
> > to commit it soon as I think it is not controversial.
>
> Looks reasonable indeed. Aren't you forgetting Bo's scons baby?
Yep, you're right. Then there's also cmake. Perhaps I was unconsciously
trying to limit the damage my first commit could cause ;-)
--
Enrico
Log:
* 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.
Index: configure.ac
===================================================================
--- configure.ac (revision 14979)
+++ configure.ac (working copy)
@@ -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)
Index: development/cmake/config.h.cmake
===================================================================
--- development/cmake/config.h.cmake (revision 14979)
+++ development/cmake/config.h.cmake (working copy)
@@ -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
Index: development/scons/SConstruct
===================================================================
--- development/scons/SConstruct (revision 14979)
+++ development/scons/SConstruct (working copy)
@@ -931,6 +931,8 @@ if not fast_start or not os.path.isfile(
#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'
