3 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index c88d8ead..418b6d49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,8 @@ AC_CHECK_LIB([xmlparse], [XML_ParserCreate],
   [AC_DEFINE([READ_GNUCASH], [1], [Support reading gnucash files])
    AM_CONDITIONAL(READ_GNUCASH, true)
    AC_SUBST(LIBS, "-lxmlparse -lxmltok $LIBS")],
-  AC_MSG_NOTICE([Could not find xmlparse library; gnucash support disabled]),
+  [AC_MSG_NOTICE([Could not find xmlparse library; gnucash support disabled])
+   AM_CONDITIONAL(READ_GNUCASH, false)],
   [-lxmltok])
 
 # Check for options
diff --git a/debug.h b/debug.h
index 51ec4f50..0173e7b0 100644
--- a/debug.h
+++ b/debug.h
@@ -11,7 +11,7 @@
 #define DEBUG_LEVEL RELEASE
 #endif
 
-#if DEBUG_LEVEL >= BETA
+#if DEBUG_LEVEL >= RELEASE
 #include <cassert>
 #endif
 
diff --git a/option.cc b/option.cc
index 82128318..98557c7c 100644
--- a/option.cc
+++ b/option.cc
@@ -1,10 +1,11 @@
 #include "option.h"
 #include "debug.h"
-#include "util.h"
 
 #include <iostream>
 #include <cstdarg>
 
+#include "util.h"
+
 option_handler::option_handler(const std::string& label,
 			       const std::string& opt_chars)
   : handled(false)