Separate C++17 from newer *mm API.

1 files changed, 5 insertions, 4 deletions

diff --git a/wscript b/wscript
index 4cc7382..c0e8e9b 100644
--- a/wscript
+++ b/wscript
@@ -42,17 +42,18 @@ def options(opt):
     opt.add_option('--static', action='store_true', default=False, help='build statically')
     opt.add_option('--static-boost', action='store_true', default=False, help='link statically against boost')
     opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
-    opt.add_option('--c++17', action='store_true', default=False, help='build with C++17 and libxml++-4.0')
+    opt.add_option('--c++17', action='store_true', default=False, help='build with C++17')
+    opt.add_option('--new-mm', action='store_true', default=False, help='build libxml++-4.0')
 
 def configure(conf):
     conf.load('compiler_cxx')
 
-    if vars(conf.options)['c++17']:
-        cpp_std = '17'
+    cpp_std = '17' if vars(conf.options)['c++17'] else '11'
+
+    if vars(conf.options)['new-mm']:
         conf.env.XMLPP_API = '4.0'
         conf.env.GLIBMM_API = '2.68'
     else:
-        cpp_std = '11'
         conf.env.XMLPP_API = '2.6'
         conf.env.GLIBMM_API = '2.4'