More arch build fixes (#1449).

diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h
index fa5250a1ad184225f6994f0c6767dd072c28e9c5..dd8ee49ed34a02594a0491208aff50b44b7e0014 100644 (file)
--- a/src/lib/dcpomatic_socket.h
+++ b/src/lib/dcpomatic_socket.h
@@ -19,6 +19,7 @@
 */
 
 #include <boost/asio.hpp>
+#include <boost/noncopyable.hpp>
 
 /** @class Socket
  *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things

diff --git a/src/lib/server.h b/src/lib/server.h
index 747c516a2ba0a5df685f42177b8c16537643cf8a..465a444d76d3dceaa0c2a67508322a317a35f8f7 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -24,6 +24,7 @@
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/condition.hpp>
+#include <boost/noncopyable.hpp>
 #include <string>
 
 class Socket;

diff --git a/src/wx/wscript b/src/wx/wscript
index 74d4d8bcec7b9cffdebb484c810b6cb455225ca9..3be3a6763695b0e0ab620224c607479408dfecd3 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -171,8 +171,8 @@ def configure(conf):
         conf.env.STLIBPATH_WXWIDGETS = stlib_paths
 
     conf.in_msg = 1
-    wx_version = conf.check_cfg(package='', path=wx_config, args='--version').strip()
-    conf.im_msg = 0
+    wx_version = subprocess.check_output([wx_config, '--version']).decode('UTF-8')
+    conf.in_msg = 0
     if not wx_version.startswith('3.0.'):
         conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)