From be0980e37b726553e0c88253ee73a80f9624fc6e Mon Sep 17 00:00:00 2001 From: Neill Miller Date: Thu, 7 Jun 2018 15:31:50 -0400 Subject: [PATCH] Update boost to version 1.62.0 --- .../libbitcoin-examples.vcxproj | 52 ++++---- .../libbitcoin-examples.vcxproj.filters | 8 +- .../libbitcoin-examples/packages.config | 26 ++-- .../libbitcoin-test/libbitcoin-test.vcxproj | 56 ++++----- .../libbitcoin-test.vcxproj.filters | 48 ++++++-- .../vs2013/libbitcoin-test/packages.config | 28 ++--- .../msvc/vs2013/libbitcoin/libbitcoin.vcxproj | 52 ++++---- .../libbitcoin/libbitcoin.vcxproj.filters | 112 ++++++++++++------ builds/msvc/vs2013/libbitcoin/packages.config | 26 ++-- .../libbitcoin-examples.vcxproj.filters | 8 +- .../libbitcoin-test.vcxproj.filters | 48 ++++++-- .../libbitcoin/libbitcoin.vcxproj.filters | 110 +++++++++++------ .../libbitcoin-examples.vcxproj.filters | 8 +- .../libbitcoin-test.vcxproj.filters | 48 ++++++-- .../libbitcoin/libbitcoin.vcxproj.filters | 110 +++++++++++------ configure.ac | 6 +- install.sh | 4 +- 17 files changed, 492 insertions(+), 258 deletions(-) diff --git a/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj b/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj index 818e9db320a..dde545bbeaf 100644 --- a/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj +++ b/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj @@ -84,38 +84,38 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj.filters b/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj.filters index f2b165a4d09..03cc4866d3a 100644 --- a/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj.filters +++ b/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj.filters @@ -8,11 +8,17 @@ - {B726DF7D-6D1D-48FB-0000-000000000001} + {B726DF7D-6D1D-48FB-0000-000000000003} {B726DF7D-6D1D-48FB-0000-000000000000} + + {B726DF7D-6D1D-48FB-0000-000000000001} + + + {B726DF7D-6D1D-48FB-0000-000000000002} + diff --git a/builds/msvc/vs2013/libbitcoin-examples/packages.config b/builds/msvc/vs2013/libbitcoin-examples/packages.config index f2d43f36954..89784cfbe0b 100644 --- a/builds/msvc/vs2013/libbitcoin-examples/packages.config +++ b/builds/msvc/vs2013/libbitcoin-examples/packages.config @@ -6,18 +6,18 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/builds/msvc/vs2013/libbitcoin-test/libbitcoin-test.vcxproj b/builds/msvc/vs2013/libbitcoin-test/libbitcoin-test.vcxproj index eba2ea0596b..894acfa32cb 100644 --- a/builds/msvc/vs2013/libbitcoin-test/libbitcoin-test.vcxproj +++ b/builds/msvc/vs2013/libbitcoin-test/libbitcoin-test.vcxproj @@ -197,41 +197,41 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/builds/msvc/vs2013/libbitcoin-test/libbitcoin-test.vcxproj.filters b/builds/msvc/vs2013/libbitcoin-test/libbitcoin-test.vcxproj.filters index 18be8978cd0..ef988f257ea 100644 --- a/builds/msvc/vs2013/libbitcoin-test/libbitcoin-test.vcxproj.filters +++ b/builds/msvc/vs2013/libbitcoin-test/libbitcoin-test.vcxproj.filters @@ -10,33 +10,63 @@ {51A424A9-2C12-4211-0000-000000000000} - + {51A424A9-2C12-4211-0000-000000000001} - + {51A424A9-2C12-4211-0000-000000000002} - + + {51A424A9-2C12-4211-0000-00000000000B} + + {51A424A9-2C12-4211-0000-000000000003} - + + {51A424A9-2C12-4211-0000-00000000000C} + + {51A424A9-2C12-4211-0000-000000000004} - + + {51A424A9-2C12-4211-0000-00000000000D} + + {51A424A9-2C12-4211-0000-000000000005} - + + {51A424A9-2C12-4211-0000-00000000000E} + + {51A424A9-2C12-4211-0000-000000000006} - + + {51A424A9-2C12-4211-0000-00000000000F} + + {51A424A9-2C12-4211-0000-000000000007} - + + {51A424A9-2C12-4211-0000-000000000001} + + {51A424A9-2C12-4211-0000-000000000008} - + + {51A424A9-2C12-4211-0000-000000000002} + + {51A424A9-2C12-4211-0000-000000000009} + + {51A424A9-2C12-4211-0000-000000000003} + + + {51A424A9-2C12-4211-0000-00000000000A} + + + {51A424A9-2C12-4211-0000-000000000004} + diff --git a/builds/msvc/vs2013/libbitcoin-test/packages.config b/builds/msvc/vs2013/libbitcoin-test/packages.config index fc564b8ffea..673c710a46b 100644 --- a/builds/msvc/vs2013/libbitcoin-test/packages.config +++ b/builds/msvc/vs2013/libbitcoin-test/packages.config @@ -6,19 +6,19 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj b/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj index e5c934315a4..71e61837620 100644 --- a/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj +++ b/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj @@ -523,38 +523,38 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj.filters b/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj.filters index 09b9baf46ac..b3544c46628 100644 --- a/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj.filters +++ b/builds/msvc/vs2013/libbitcoin/libbitcoin.vcxproj.filters @@ -8,112 +8,154 @@ - {39F60708-FF48-4C22-0000-00000000000D} + {39F60708-FF48-4C22-0000-0000000000B1} - {39F60708-FF48-4C22-0000-00000000000E} + {39F60708-FF48-4C22-0000-0000000000C1} - {39F60708-FF48-4C22-0000-00000000000F} + {39F60708-FF48-4C22-0000-0000000000D1} - {39F60708-FF48-4C22-0000-000000000001} + {39F60708-FF48-4C22-0000-0000000000E1} - {39F60708-FF48-4C22-0000-000000000002} + {39F60708-FF48-4C22-0000-0000000000F1} - {39F60708-FF48-4C22-0000-000000000003} + {39F60708-FF48-4C22-0000-000000000002} - {39F60708-FF48-4C22-0000-000000000004} + {39F60708-FF48-4C22-0000-000000000003} - {39F60708-FF48-4C22-0000-0000000000B1} + {39F60708-FF48-4C22-0000-000000000011} - {39F60708-FF48-4C22-0000-0000000000C1} + {39F60708-FF48-4C22-0000-0000000000A2} - {39F60708-FF48-4C22-0000-000000000002} + {39F60708-FF48-4C22-0000-0000000000E2} - {39F60708-FF48-4C22-0000-0000000000D1} + {39F60708-FF48-4C22-0000-0000000000B2} - {39F60708-FF48-4C22-0000-0000000000E1} + {39F60708-FF48-4C22-0000-0000000000C2} - {39F60708-FF48-4C22-0000-0000000000F1} + {39F60708-FF48-4C22-0000-0000000000D2} - {39F60708-FF48-4C22-0000-000000000005} + {39F60708-FF48-4C22-0000-000000000004} - {39F60708-FF48-4C22-0000-000000000003} + {39F60708-FF48-4C22-0000-0000000000F2} - {39F60708-FF48-4C22-0000-000000000006} + {39F60708-FF48-4C22-0000-000000000005} - {39F60708-FF48-4C22-0000-000000000007} + {39F60708-FF48-4C22-0000-000000000006} - {39F60708-FF48-4C22-0000-000000000008} + {39F60708-FF48-4C22-0000-000000000007} - {39F60708-FF48-4C22-0000-000000000009} + {39F60708-FF48-4C22-0000-000000000008} - {39F60708-FF48-4C22-0000-000000000010} + {39F60708-FF48-4C22-0000-000000000009} - {39F60708-FF48-4C22-0000-0000000000A1} + {39F60708-FF48-4C22-0000-000000000010} - {39F60708-FF48-4C22-0000-000000000004} + {39F60708-FF48-4C22-0000-000000000003} {39F60708-FF48-4C22-0000-000000000000} - {39F60708-FF48-4C22-0000-000000000005} + {39F60708-FF48-4C22-0000-000000000004} - + {39F60708-FF48-4C22-0000-000000000001} - + {39F60708-FF48-4C22-0000-000000000002} - + {39F60708-FF48-4C22-0000-000000000003} - + + {39F60708-FF48-4C22-0000-00000000000D} + + {39F60708-FF48-4C22-0000-000000000004} - + + {39F60708-FF48-4C22-0000-00000000000E} + + {39F60708-FF48-4C22-0000-000000000005} - + + {39F60708-FF48-4C22-0000-00000000000F} + + {39F60708-FF48-4C22-0000-000000000006} + + {39F60708-FF48-4C22-0000-000000000001} + + + {39F60708-FF48-4C22-0000-000000000007} + + + {39F60708-FF48-4C22-0000-000000000002} + + + {39F60708-FF48-4C22-0000-000000000008} + + + {39F60708-FF48-4C22-0000-000000000003} + - {39F60708-FF48-4C22-0000-00000000000B} + {39F60708-FF48-4C22-0000-000000000004} + + + {39F60708-FF48-4C22-0000-000000000005} - {39F60708-FF48-4C22-0000-000000000007} + {39F60708-FF48-4C22-0000-000000000009} + + + {39F60708-FF48-4C22-0000-000000000006} - {39F60708-FF48-4C22-0000-000000000008} + {39F60708-FF48-4C22-0000-00000000000A} + + + {39F60708-FF48-4C22-0000-000000000007} - {39F60708-FF48-4C22-0000-000000000009} + {39F60708-FF48-4C22-0000-00000000000B} + + + {39F60708-FF48-4C22-0000-000000000008} - {39F60708-FF48-4C22-0000-00000000000A} + {39F60708-FF48-4C22-0000-00000000000C} + + + {39F60708-FF48-4C22-0000-000000000009} - {39F60708-FF48-4C22-0000-00000000000C} + {39F60708-FF48-4C22-0000-000000000010} + + + {39F60708-FF48-4C22-0000-0000000000A1} diff --git a/builds/msvc/vs2013/libbitcoin/packages.config b/builds/msvc/vs2013/libbitcoin/packages.config index f2d43f36954..89784cfbe0b 100644 --- a/builds/msvc/vs2013/libbitcoin/packages.config +++ b/builds/msvc/vs2013/libbitcoin/packages.config @@ -6,18 +6,18 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/builds/msvc/vs2015/libbitcoin-examples/libbitcoin-examples.vcxproj.filters b/builds/msvc/vs2015/libbitcoin-examples/libbitcoin-examples.vcxproj.filters index f2b165a4d09..03cc4866d3a 100644 --- a/builds/msvc/vs2015/libbitcoin-examples/libbitcoin-examples.vcxproj.filters +++ b/builds/msvc/vs2015/libbitcoin-examples/libbitcoin-examples.vcxproj.filters @@ -8,11 +8,17 @@ - {B726DF7D-6D1D-48FB-0000-000000000001} + {B726DF7D-6D1D-48FB-0000-000000000003} {B726DF7D-6D1D-48FB-0000-000000000000} + + {B726DF7D-6D1D-48FB-0000-000000000001} + + + {B726DF7D-6D1D-48FB-0000-000000000002} + diff --git a/builds/msvc/vs2015/libbitcoin-test/libbitcoin-test.vcxproj.filters b/builds/msvc/vs2015/libbitcoin-test/libbitcoin-test.vcxproj.filters index 18be8978cd0..ef988f257ea 100644 --- a/builds/msvc/vs2015/libbitcoin-test/libbitcoin-test.vcxproj.filters +++ b/builds/msvc/vs2015/libbitcoin-test/libbitcoin-test.vcxproj.filters @@ -10,33 +10,63 @@ {51A424A9-2C12-4211-0000-000000000000} - + {51A424A9-2C12-4211-0000-000000000001} - + {51A424A9-2C12-4211-0000-000000000002} - + + {51A424A9-2C12-4211-0000-00000000000B} + + {51A424A9-2C12-4211-0000-000000000003} - + + {51A424A9-2C12-4211-0000-00000000000C} + + {51A424A9-2C12-4211-0000-000000000004} - + + {51A424A9-2C12-4211-0000-00000000000D} + + {51A424A9-2C12-4211-0000-000000000005} - + + {51A424A9-2C12-4211-0000-00000000000E} + + {51A424A9-2C12-4211-0000-000000000006} - + + {51A424A9-2C12-4211-0000-00000000000F} + + {51A424A9-2C12-4211-0000-000000000007} - + + {51A424A9-2C12-4211-0000-000000000001} + + {51A424A9-2C12-4211-0000-000000000008} - + + {51A424A9-2C12-4211-0000-000000000002} + + {51A424A9-2C12-4211-0000-000000000009} + + {51A424A9-2C12-4211-0000-000000000003} + + + {51A424A9-2C12-4211-0000-00000000000A} + + + {51A424A9-2C12-4211-0000-000000000004} + diff --git a/builds/msvc/vs2015/libbitcoin/libbitcoin.vcxproj.filters b/builds/msvc/vs2015/libbitcoin/libbitcoin.vcxproj.filters index 3aae0658732..7be83e29a15 100644 --- a/builds/msvc/vs2015/libbitcoin/libbitcoin.vcxproj.filters +++ b/builds/msvc/vs2015/libbitcoin/libbitcoin.vcxproj.filters @@ -8,109 +8,151 @@ - {39F60708-FF48-4C22-0000-00000000000D} + {39F60708-FF48-4C22-0000-0000000000B1} - {39F60708-FF48-4C22-0000-00000000000E} + {39F60708-FF48-4C22-0000-0000000000C1} - {39F60708-FF48-4C22-0000-00000000000F} + {39F60708-FF48-4C22-0000-0000000000D1} - {39F60708-FF48-4C22-0000-000000000001} + {39F60708-FF48-4C22-0000-0000000000E1} - {39F60708-FF48-4C22-0000-000000000002} + {39F60708-FF48-4C22-0000-0000000000F1} - {39F60708-FF48-4C22-0000-000000000003} + {39F60708-FF48-4C22-0000-000000000002} - {39F60708-FF48-4C22-0000-000000000004} + {39F60708-FF48-4C22-0000-000000000003} - {39F60708-FF48-4C22-0000-0000000000B1} + {39F60708-FF48-4C22-0000-000000000011} - {39F60708-FF48-4C22-0000-0000000000C1} + {39F60708-FF48-4C22-0000-0000000000A2} - {39F60708-FF48-4C22-0000-000000000002} + {39F60708-FF48-4C22-0000-0000000000E2} - {39F60708-FF48-4C22-0000-0000000000D1} + {39F60708-FF48-4C22-0000-0000000000B2} - {39F60708-FF48-4C22-0000-0000000000E1} + {39F60708-FF48-4C22-0000-0000000000C2} - {39F60708-FF48-4C22-0000-0000000000F1} + {39F60708-FF48-4C22-0000-0000000000D2} - {39F60708-FF48-4C22-0000-000000000005} + {39F60708-FF48-4C22-0000-000000000004} - {39F60708-FF48-4C22-0000-000000000003} + {39F60708-FF48-4C22-0000-0000000000F2} - {39F60708-FF48-4C22-0000-000000000006} + {39F60708-FF48-4C22-0000-000000000005} - {39F60708-FF48-4C22-0000-000000000007} + {39F60708-FF48-4C22-0000-000000000006} - {39F60708-FF48-4C22-0000-000000000008} + {39F60708-FF48-4C22-0000-000000000007} - {39F60708-FF48-4C22-0000-000000000009} + {39F60708-FF48-4C22-0000-000000000008} - {39F60708-FF48-4C22-0000-000000000010} + {39F60708-FF48-4C22-0000-000000000009} - {39F60708-FF48-4C22-0000-0000000000A1} + {39F60708-FF48-4C22-0000-000000000010} - {39F60708-FF48-4C22-0000-000000000004} + {39F60708-FF48-4C22-0000-000000000003} {39F60708-FF48-4C22-0000-000000000000} - + {39F60708-FF48-4C22-0000-000000000001} - + {39F60708-FF48-4C22-0000-000000000002} - + {39F60708-FF48-4C22-0000-000000000003} - + + {39F60708-FF48-4C22-0000-00000000000D} + + {39F60708-FF48-4C22-0000-000000000004} - + + {39F60708-FF48-4C22-0000-00000000000E} + + {39F60708-FF48-4C22-0000-000000000005} - + + {39F60708-FF48-4C22-0000-00000000000F} + + {39F60708-FF48-4C22-0000-000000000006} + + {39F60708-FF48-4C22-0000-000000000001} + + + {39F60708-FF48-4C22-0000-000000000007} + + + {39F60708-FF48-4C22-0000-000000000002} + + + {39F60708-FF48-4C22-0000-000000000008} + + + {39F60708-FF48-4C22-0000-000000000003} + - {39F60708-FF48-4C22-0000-00000000000B} + {39F60708-FF48-4C22-0000-000000000004} + + + {39F60708-FF48-4C22-0000-000000000005} - {39F60708-FF48-4C22-0000-000000000007} + {39F60708-FF48-4C22-0000-000000000009} + + + {39F60708-FF48-4C22-0000-000000000006} - {39F60708-FF48-4C22-0000-000000000008} + {39F60708-FF48-4C22-0000-00000000000A} + + + {39F60708-FF48-4C22-0000-000000000007} - {39F60708-FF48-4C22-0000-000000000009} + {39F60708-FF48-4C22-0000-00000000000B} + + + {39F60708-FF48-4C22-0000-000000000008} - {39F60708-FF48-4C22-0000-00000000000A} + {39F60708-FF48-4C22-0000-00000000000C} + + + {39F60708-FF48-4C22-0000-000000000009} - {39F60708-FF48-4C22-0000-00000000000C} + {39F60708-FF48-4C22-0000-000000000010} + + + {39F60708-FF48-4C22-0000-0000000000A1} diff --git a/builds/msvc/vs2017/libbitcoin-examples/libbitcoin-examples.vcxproj.filters b/builds/msvc/vs2017/libbitcoin-examples/libbitcoin-examples.vcxproj.filters index f2b165a4d09..03cc4866d3a 100644 --- a/builds/msvc/vs2017/libbitcoin-examples/libbitcoin-examples.vcxproj.filters +++ b/builds/msvc/vs2017/libbitcoin-examples/libbitcoin-examples.vcxproj.filters @@ -8,11 +8,17 @@ - {B726DF7D-6D1D-48FB-0000-000000000001} + {B726DF7D-6D1D-48FB-0000-000000000003} {B726DF7D-6D1D-48FB-0000-000000000000} + + {B726DF7D-6D1D-48FB-0000-000000000001} + + + {B726DF7D-6D1D-48FB-0000-000000000002} + diff --git a/builds/msvc/vs2017/libbitcoin-test/libbitcoin-test.vcxproj.filters b/builds/msvc/vs2017/libbitcoin-test/libbitcoin-test.vcxproj.filters index 18be8978cd0..ef988f257ea 100644 --- a/builds/msvc/vs2017/libbitcoin-test/libbitcoin-test.vcxproj.filters +++ b/builds/msvc/vs2017/libbitcoin-test/libbitcoin-test.vcxproj.filters @@ -10,33 +10,63 @@ {51A424A9-2C12-4211-0000-000000000000} - + {51A424A9-2C12-4211-0000-000000000001} - + {51A424A9-2C12-4211-0000-000000000002} - + + {51A424A9-2C12-4211-0000-00000000000B} + + {51A424A9-2C12-4211-0000-000000000003} - + + {51A424A9-2C12-4211-0000-00000000000C} + + {51A424A9-2C12-4211-0000-000000000004} - + + {51A424A9-2C12-4211-0000-00000000000D} + + {51A424A9-2C12-4211-0000-000000000005} - + + {51A424A9-2C12-4211-0000-00000000000E} + + {51A424A9-2C12-4211-0000-000000000006} - + + {51A424A9-2C12-4211-0000-00000000000F} + + {51A424A9-2C12-4211-0000-000000000007} - + + {51A424A9-2C12-4211-0000-000000000001} + + {51A424A9-2C12-4211-0000-000000000008} - + + {51A424A9-2C12-4211-0000-000000000002} + + {51A424A9-2C12-4211-0000-000000000009} + + {51A424A9-2C12-4211-0000-000000000003} + + + {51A424A9-2C12-4211-0000-00000000000A} + + + {51A424A9-2C12-4211-0000-000000000004} + diff --git a/builds/msvc/vs2017/libbitcoin/libbitcoin.vcxproj.filters b/builds/msvc/vs2017/libbitcoin/libbitcoin.vcxproj.filters index 3bb6ce6a62f..7ee3a0dc757 100644 --- a/builds/msvc/vs2017/libbitcoin/libbitcoin.vcxproj.filters +++ b/builds/msvc/vs2017/libbitcoin/libbitcoin.vcxproj.filters @@ -8,109 +8,151 @@ - {39F60708-FF48-4C22-0000-00000000000D} + {39F60708-FF48-4C22-0000-0000000000B1} - {39F60708-FF48-4C22-0000-00000000000E} + {39F60708-FF48-4C22-0000-0000000000C1} - {39F60708-FF48-4C22-0000-00000000000F} + {39F60708-FF48-4C22-0000-0000000000D1} - {39F60708-FF48-4C22-0000-000000000001} + {39F60708-FF48-4C22-0000-0000000000E1} - {39F60708-FF48-4C22-0000-000000000002} + {39F60708-FF48-4C22-0000-0000000000F1} - {39F60708-FF48-4C22-0000-000000000003} + {39F60708-FF48-4C22-0000-000000000002} - {39F60708-FF48-4C22-0000-000000000004} + {39F60708-FF48-4C22-0000-000000000003} - {39F60708-FF48-4C22-0000-0000000000B1} + {39F60708-FF48-4C22-0000-000000000011} - {39F60708-FF48-4C22-0000-0000000000C1} + {39F60708-FF48-4C22-0000-0000000000A2} - {39F60708-FF48-4C22-0000-000000000002} + {39F60708-FF48-4C22-0000-0000000000E2} - {39F60708-FF48-4C22-0000-0000000000D1} + {39F60708-FF48-4C22-0000-0000000000B2} - {39F60708-FF48-4C22-0000-0000000000E1} + {39F60708-FF48-4C22-0000-0000000000C2} - {39F60708-FF48-4C22-0000-0000000000F1} + {39F60708-FF48-4C22-0000-0000000000D2} - {39F60708-FF48-4C22-0000-000000000005} + {39F60708-FF48-4C22-0000-000000000004} - {39F60708-FF48-4C22-0000-000000000003} + {39F60708-FF48-4C22-0000-0000000000F2} - {39F60708-FF48-4C22-0000-000000000006} + {39F60708-FF48-4C22-0000-000000000005} - {39F60708-FF48-4C22-0000-000000000007} + {39F60708-FF48-4C22-0000-000000000006} - {39F60708-FF48-4C22-0000-000000000008} + {39F60708-FF48-4C22-0000-000000000007} - {39F60708-FF48-4C22-0000-000000000009} + {39F60708-FF48-4C22-0000-000000000008} - {39F60708-FF48-4C22-0000-000000000010} + {39F60708-FF48-4C22-0000-000000000009} - {39F60708-FF48-4C22-0000-0000000000A1} + {39F60708-FF48-4C22-0000-000000000010} - {39F60708-FF48-4C22-0000-000000000004} + {39F60708-FF48-4C22-0000-000000000003} {39F60708-FF48-4C22-0000-000000000000} - + {39F60708-FF48-4C22-0000-000000000001} - + {39F60708-FF48-4C22-0000-000000000002} - + {39F60708-FF48-4C22-0000-000000000003} - + + {39F60708-FF48-4C22-0000-00000000000D} + + {39F60708-FF48-4C22-0000-000000000004} - + + {39F60708-FF48-4C22-0000-00000000000E} + + {39F60708-FF48-4C22-0000-000000000005} - + + {39F60708-FF48-4C22-0000-00000000000F} + + {39F60708-FF48-4C22-0000-000000000006} + + {39F60708-FF48-4C22-0000-000000000001} + + + {39F60708-FF48-4C22-0000-000000000007} + + + {39F60708-FF48-4C22-0000-000000000002} + + + {39F60708-FF48-4C22-0000-000000000008} + + + {39F60708-FF48-4C22-0000-000000000003} + - {39F60708-FF48-4C22-0000-00000000000B} + {39F60708-FF48-4C22-0000-000000000004} + + + {39F60708-FF48-4C22-0000-000000000005} - {39F60708-FF48-4C22-0000-000000000007} + {39F60708-FF48-4C22-0000-000000000009} + + + {39F60708-FF48-4C22-0000-000000000006} - {39F60708-FF48-4C22-0000-000000000008} + {39F60708-FF48-4C22-0000-00000000000A} + + + {39F60708-FF48-4C22-0000-000000000007} - {39F60708-FF48-4C22-0000-000000000009} + {39F60708-FF48-4C22-0000-00000000000B} + + + {39F60708-FF48-4C22-0000-000000000008} - {39F60708-FF48-4C22-0000-00000000000A} + {39F60708-FF48-4C22-0000-00000000000C} + + + {39F60708-FF48-4C22-0000-000000000009} - {39F60708-FF48-4C22-0000-00000000000C} + {39F60708-FF48-4C22-0000-000000000010} + + + {39F60708-FF48-4C22-0000-0000000000A1} diff --git a/configure.ac b/configure.ac index 4b7bbc6300c..6ef11c84c9b 100644 --- a/configure.ac +++ b/configure.ac @@ -151,15 +151,15 @@ AS_CASE([${enable_shared}], [yes], AC_DEFINE([BOOST_ALL_DYN_LINK])) # Check dependencies. #============================================================================== -# Require Boost of at least version 1.57.0 and output ${boost_CPPFLAGS/LDFLAGS}. +# Require Boost of at least version 1.62.0 and output ${boost_CPPFLAGS/LDFLAGS}. #------------------------------------------------------------------------------ AS_CASE([${CC}], [*], - [AX_BOOST_BASE([1.57.0], + [AX_BOOST_BASE([1.62.0], [AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}]) AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}]) AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}]) AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])], - [AC_MSG_ERROR([Boost 1.57.0 or later is required but was not found.])])]) + [AC_MSG_ERROR([Boost 1.62.0 or later is required but was not found.])])]) AX_BOOST_CHRONO AC_SUBST([boost_chrono_LIBS], [${BOOST_CHRONO_LIB}]) diff --git a/install.sh b/install.sh index ae78210fdd3..c1f8354af91 100755 --- a/install.sh +++ b/install.sh @@ -56,8 +56,8 @@ QRENCODE_ARCHIVE="qrencode-3.4.4.tar.bz2" # Boost archive. #------------------------------------------------------------------------------ -BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.57.0/boost_1_57_0.tar.bz2" -BOOST_ARCHIVE="boost_1_57_0.tar.bz2" +BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.62.0/boost_1_62_0.tar.bz2" +BOOST_ARCHIVE="boost_1_62_0.tar.bz2" # Define utility functions.