[lmi-commits] [lmi] master 87a6f12b 2/4: Update to the latest wx pre-3.3.0 release

[Greg Chicares]

branch: master
commit 87a6f12b92cee70131c6fd79dde9c0661d72aacc
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Update to the latest wx pre-3.3.0 release
    
    This version doesn't require using --enable-stl to use STL containers
    any longer, so remove this option and also stop checking for it in
    configure.
---
 configure.ac   | 3 +--
 install_wx.sh  | 1 -
 third_party/wx | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6adbc4e8..654b1db6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -312,8 +312,7 @@ dnl check that the library options allow to build lmi
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <wx/setup.h>]], [[
     #if !wxUSE_DOC_VIEW_ARCHITECTURE || \
         !wxUSE_MDI_ARCHITECTURE || \
-        !wxUSE_PRINTING_ARCHITECTURE || \
-        !(wxUSE_STL || wxUSE_STD_STRING)
+        !wxUSE_PRINTING_ARCHITECTURE
         wrong wx library options
     #endif
     ]])],
diff --git a/install_wx.sh b/install_wx.sh
index 9a05e7be..17085416 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -88,7 +88,6 @@ config_options="
   --enable-monolithic
   --enable-option-checking
   --enable-shared
-  --enable-stl
   --enable-vendor=$vendor
   --without-opengl
   --without-subdirs
diff --git a/third_party/wx b/third_party/wx
index a812fffd..1093bb49 160000
--- a/third_party/wx
+++ b/third_party/wx
@@ -1 +1 @@
-Subproject commit a812fffda3fe686c94e24bff27e8effd96e4de64
+Subproject commit 1093bb492bc90531162490ba1711f9dba09f59e0