2 files changed, 4 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index f16148b..101a62d 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ lilv (9999) unstable;
   * Gracefully handle failure to save plugin state and print error message
   * Reduce memory usage (per node)
   * Add lv2bench utility
+  * Do not require a C++ compiler to build
 
  -- David Robillard <d@drobilla.net>
 
diff --git a/wscript b/wscript
index b7183f4..b4ea23d 100644
--- a/wscript
+++ b/wscript
@@ -53,12 +53,12 @@ def options(opt):
 
 def configure(conf):
     conf.load('compiler_c')
-    conf.load('compiler_cxx')
-    conf.load('python')
 
     if Options.options.bindings:
         try:
-            conf.load('swig python')
+            conf.load('swig')
+            conf.load('python')
+            conf.load('compiler_cxx')
             conf.check_python_headers()
             autowaf.define(conf, 'LILV_PYTHON', 1);
         except: