AuroraMiddleware/asio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated build files to support boost 1.32.0.

Browse Source
This commit is contained in:
chris_kohlhoff 2004-11-21 00:42:04 +00:00
parent 7313c85ed4
commit 60630216f1
5 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
asio/INSTALL
View File

@ -31,8 +31,8 @@ combinations:
2. Requirements
===============
The asio toolkit requires any one of the boost versions 1.30.0, 1.30.2 or
1.31.0. There is no need to build any of the boost libraries to use asio, as
The asio toolkit requires any one of the boost versions 1.30.0, 1.30.2, 1.31.0
or 1.32.0. There is no need to build any of the boost libraries to use asio, as
only the header files are required.
@ -44,20 +44,20 @@ build any libraries before using asio in your own applications. You simply need
to add the following directories to your compiler include path:
- asio's `include' directory
- the boost directory (e.g. the one called boost-1.30.2 or boost_1_31_0)
- the boost directory (e.g. the one called boost-1.30.2 or boost_1_32_0)
4. Building the tests on Linux or UNIX
======================================
If the boost directory (e.g. the directory called boost-1.30.2 or boost_1_31_0)
If the boost directory (e.g. the directory called boost-1.30.2 or boost_1_32_0)
is in the same directory as the asio source kit, then you may configure asio by
simply going:
./configure
in the root directory of the asio source kit. Note that configure will always
use the most recent boost version it knows about (i.e. 1.31.0) in preference to
use the most recent boost version it knows about (i.e. 1.32.0) in preference to
earlier versions, if there is more than one version present.
If the boost directory is in some other location, then you need to specify this
@ -80,8 +80,8 @@ test that asio is working correctly, run `make check' after a successful build.
To build using the MSVC 6 or 7.1 command line compiler, perform the following
steps:
- If you are using a version of boost other than 1.31.0, or if the boost
directory (i.e. the directory called boost_1_31_0) is not in the same
- If you are using a version of boost other than 1.32.0, or if the boost
directory (i.e. the directory called boost_1_32_0) is not in the same
directory as the asio source kit, then specify the location of boost by
running a command similar to `set BOOSTDIR=path_to_boost'. Ensure that
you specify an absolute path.
@ -98,8 +98,8 @@ steps:
To build using the Borland C++ Builder 6 command line compiler, perform the
following steps:
- If you are using a version of boost other than 1.31.0, or if the boost
directory (i.e. the directory called boost_1_31_0) is not in the same
- If you are using a version of boost other than 1.32.0, or if the boost
directory (i.e. the directory called boost_1_32_0) is not in the same
directory as the asio source kit, then specify the location of boost by
running a command similar to `set BOOSTDIR=path_to_boost'. Ensure that
you specify an absolute path.
@ -116,8 +116,8 @@ following steps:
To build using the MinGW g++ compiler from the command line, perform the
following steps:
- If you are using a version of boost other than 1.31.0, or if the boost
directory (i.e. the directory called boost_1_31_0) is not in the same
- If you are using a version of boost other than 1.32.0, or if the boost
directory (i.e. the directory called boost_1_32_0) is not in the same
directory as the asio source kit, then specify the location of boost by
running a command similar to `set BOOSTDIR=path_to_boost'. Ensure that
you specify an absolute path.
@ -128,14 +128,14 @@ following steps:
5.4. Building with MinGW and MSYS
If the boost directory (e.g. the directory called boost-1.30.2 or boost_1_31_0)
If the boost directory (e.g. the directory called boost-1.30.2 or boost_1_32_0)
is in the same directory as the asio source kit, then you may configure asio by
simply going:
sh configure
in the root directory of the asio source kit. Note that configure will always
use the most recent boost version it knows about (i.e. 1.31.0) in preference to
use the most recent boost version it knows about (i.e. 1.32.0) in preference to
earlier versions, if there is more than one version present.
If the boost directory is in some other location, then you need to specify this
@ -144,6 +144,6 @@ directory when running configure:
sh configure --with-boost=<BOOSTDIR>
When specifying the boost directory in this way you should ensure that you use
an absolute path in a UNIX-style format, e.g. `/c/mydir/boost_1_31_0'.
an absolute path in a UNIX-style format, e.g. `/c/mydir/boost_1_32_0'.
To build, simply run `make' in the root directory of the asio source kit.

11
asio/configure.ac
View File

@ -16,17 +16,22 @@ AC_ARG_WITH(boost,
CPPFLAGS="$CPPFLAGS -I${withval}"
],
[
BOOSTDIR="`pwd`/../boost_1_31_0"
BOOSTDIR="`pwd`/../boost_1_32_0"
if test -d "${BOOSTDIR}"; then
CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}"
else
BOOSTDIR="`pwd`/../boost-1.30.2"
BOOSTDIR="`pwd`/../boost_1_31_0"
if test -d "${BOOSTDIR}"; then
CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}"
else
BOOSTDIR="`pwd`/../boost_1_30_0"
BOOSTDIR="`pwd`/../boost-1.30.2"
if test -d "${BOOSTDIR}"; then
CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}"
else
BOOSTDIR="`pwd`/../boost_1_30_0"
if test -d "${BOOSTDIR}"; then
CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}"
fi
fi
fi
fi

2
asio/src/Makefile.bor
View File

@ -1,5 +1,5 @@
!ifndef BOOSTDIR
BOOSTDIR = ../../boost_1_31_0
BOOSTDIR = ../../boost_1_32_0
!endif
CXXFLAGS = -q -O2 -v -vi -y -a8 -b -Ve- -Vx- -tWM -tWR -tWC -w-inl -w-par -I../include -I$(BOOSTDIR)

2
asio/src/Makefile.mgw
View File

@ -1,5 +1,5 @@
ifndef BOOSTDIR
BOOSTDIR = ../../boost_1_31_0
BOOSTDIR = ../../boost_1_32_0
endif
CXXFLAGS = -g -O3 -Wall -mthreads -I../include -I$(BOOSTDIR)

2
asio/src/Makefile.msc
View File

@ -1,5 +1,5 @@
!ifndef BOOSTDIR
BOOSTDIR = ../../boost_1_31_0
BOOSTDIR = ../../boost_1_32_0
!endif
CXXFLAGS = -nologo -O2 -GX -GR -MT -W3 -I. -I../include -I$(BOOSTDIR)