3 files changed, 14 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 9ad9710..51bacd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,6 +165,18 @@ if $nitpick ; then
  CXXFLAGS="$CXXFLAGS $CXX_NITPICK"
 fi
 
+ndebug=true
+AC_ARG_ENABLE([debug],
+ AC_HELP_STRING([--enable-debug],[enable debugging code]),
+ [ test "$enableval" = "no" || ndebug=false ]
+)
+if $ndebug ; then
+ CPPFLAGS_DEBUG="-DNDEBUG"
+else
+ CPPFLAGS_DEBUG=""
+fi
+AC_SUBST([CPPFLAGS_DEBUG])
+
 xri_proxy_url="http://beta.xri.net/"
 AC_MSG_CHECKING([for XRI resolver proxy])
 AC_ARG_ENABLE([xri-proxy],
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 185411f..9c73e96 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,6 @@
 lib_LTLIBRARIES = libopkele.la
 
+AM_CPPFLAGS = ${CPPFLAGS_DEBUG}
 DEFAULT_INCLUDES = -I${top_builddir}
 INCLUDES = \
            -I${top_srcdir}/include/ \
diff --git a/test/Makefile.am b/test/Makefile.am
index 13c4cd2..bacaafa 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,6 @@
 noinst_PROGRAMS = test idiscover
 
+AM_CPPFLAGS=${CPPFLAGS_DEBUG}
 DEFAULT_INCLUDES = -I${top_builddir}
 INCLUDES = -I${top_srcdir}/include/ ${KONFORKA_CFLAGS}