diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index f586409..6a2f257 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -190,13 +190,15 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AC_ARG_ENABLE(debug,
     [AS_HELP_STRING([--enable-debug],
                     [compile for debugger])],
-    [have_debug="$enableval"; test "$enableval" = "yes" &&  \
-       AM_CPPFLAGS="${AM_CPPFLAGS} -DDEBUG" && \
-       AM_CXXFLAGS="${AM_CXXFLAGS:-} -ggdb3 -O0" && \
-       AM_LDFLAGS="${AM_LDFLAGS} -ggdb3 -O0"])
+    [have_debug="$enableval"], [have_debug="no"])
   AM_CONDITIONAL(DEBUG, test "$enableval" = "yes")
   if test "$have_debug" == "yes"; then
     AC_MSG_NOTICE([Debug compile mode enabled]);
+    AM_CPPFLAGS="${AM_CPPFLAGS} -DDEBUG"
+    AM_CXXFLAGS="${AM_CXXFLAGS:-} -ggdb3 -O0"
+    AM_LDFLAGS="${AM_LDFLAGS} -ggdb3 -O0"
+  else
+    AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG"
   fi
 
   AC_CONFIG_FILES([makefile])