[lmi-commits] [lmi] master 22263bfa 3/4: Temporarily revert wx upgrade

[Greg Chicares]

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

    Temporarily revert wx upgrade
    
    This reverts commits 964318be1 and 87a6f12b9, in order to prepare a
    production release without the wx upgrade.
    
    To upgrade wx subsequently:
      git revert SHA1_of_this_commit
      git submodule update --recursive
      ./install_msw.sh
---
 configure.ac   | 3 ++-
 install_wx.sh  | 2 ++
 third_party/wx | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 654b1db6..6adbc4e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -312,7 +312,8 @@ 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_PRINTING_ARCHITECTURE || \
+        !(wxUSE_STL || wxUSE_STD_STRING)
         wrong wx library options
     #endif
     ]])],
diff --git a/install_wx.sh b/install_wx.sh
index 17085416..6129ff0e 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -88,7 +88,9 @@ 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 1093bb49..a812fffd 160000
--- a/third_party/wx
+++ b/third_party/wx
@@ -1 +1 @@
-Subproject commit 1093bb492bc90531162490ba1711f9dba09f59e0
+Subproject commit a812fffda3fe686c94e24bff27e8effd96e4de64