[lmi-commits] [lmi] master bf27bbcd: Revert "Temporarily revert wx upgrade"

[Greg Chicares]

branch: master
commit bf27bbcda76ac61c6cee2d6df0ffff6b8963ca0c
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Revert "Temporarily revert wx upgrade"
    
    This reverts commit 22263bfac93aa459f1d1d9b6a313f9332ed933dc,
    as announced two commits ago.
---
 configure.ac   | 3 +--
 install_wx.sh  | 2 --
 third_party/wx | 2 +-
 3 files changed, 2 insertions(+), 5 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 6129ff0e..17085416 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -88,9 +88,7 @@ config_options="
   --enable-monolithic
   --enable-option-checking
   --enable-shared
-  --enable-stl
   --enable-vendor=$vendor
-  --with-cxx=11
   --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