Update build files to add support for boost 1.31.0.

asio/INSTALL

@@ -30,9 +30,9 @@ combinations:
 2. Requirements
 ===============
 
-The asio toolkit requires either of the boost versions 1.30.0 or 1.30.2. There
-is no need to build any of the boost libraries to use asio, as only the header
-files are required.
+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
+only the header files are required.
 
 
 3. Before using asio
@@ -43,20 +43,21 @@ 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 (i.e. the one called boost-1.30.2 or boost_1_30_0)
+  - the boost directory (e.g. the one called boost-1.30.2 or boost_1_31_0)
 
 
 4. Building the tests on Linux
 ==============================
 
-If the boost directory (i.e. the directory called boost-1.30.2 or boost_1_30_0)
+If the boost directory (e.g. the directory called boost-1.30.2 or boost_1_31_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 1.30.2 in preference to 1.30.0 if both versions are present.
+use the most recent boost version it knows about (i.e. 1.31.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
 directory when running configure:
@@ -77,8 +78,8 @@ To build, simply run `make' in the root directory of the asio source kit.
 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.30.2, or if the boost
-    directory (i.e. the directory called boost-1.30.2) is not in the same
+  - 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
     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.
@@ -92,8 +93,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.30.2, or if the boost
-    directory (i.e. the directory called boost-1.30.2) is not in the same
+  - 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
     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.
@@ -107,8 +108,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.30.2, or if the boost
-    directory (i.e. the directory called boost-1.30.2) is not in the same
+  - 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
     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.
@@ -119,14 +120,15 @@ following steps:
 
 5.4. Building with MinGW and MSYS
 
-If the boost directory (i.e. the directory called boost-1.30.2 or boost_1_30_0)
+If the boost directory (e.g. the directory called boost-1.30.2 or boost_1_31_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 1.30.2 in preference to 1.30.0 if both versions are present.
+use the most recent boost version it knows about (i.e. 1.31.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
 directory when running configure:
@@ -134,6 +136,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.30.2'.
+an absolute path in a UNIX-style format, e.g. `/c/mydir/boost_1_31_0'.
 
 To build, simply run `make' in the root directory of the asio source kit.

asio/configure.in

@@ -15,13 +15,18 @@ AC_ARG_WITH(boost,
   CPPFLAGS="$CPPFLAGS -I${withval}"
 ],
 [
-  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
 ])

asio/src/Makefile.bor

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

asio/src/Makefile.mgw

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

asio/src/Makefile.msc

@@ -1,5 +1,5 @@
 !ifndef BOOSTDIR
-BOOSTDIR = ../../boost-1.30.2
+BOOSTDIR = ../../boost_1_31_0
 !endif
 
 CXXFLAGS = -nologo -O2 -GX -GR -Zi -w -MD -I. -I../include -I$(BOOSTDIR)