diff --git a/configure.ac b/configure.ac
index ccb6936..20c6cd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,17 @@ AS_IF([test "x$enable_build_examples" = "xyes"], [
 
 AM_CONDITIONAL(BUILD_EXAMPLES, test "x$enable_build_examples" = "xyes")
 
+AC_ARG_ENABLE([build_tests],
+    AS_HELP_STRING([--enable-build-tests], [Enable build of tests]))
+
+AS_IF([test "x$enable_build_tests" = "xyes"], [
+  AC_DEFINE([BUILD_TESTS], 1, [build of tests enabled])
+])
+
+AM_CONDITIONAL(BUILD_TESTS, test "x$enable_tests_examples" = "xyes")
+
+
+
 PKG_CHECK_MODULES(LIBUUID, [uuid])
 
 PKG_CHECK_MODULES(OPENSSL, [openssl])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 73bce76..4f20f19 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,9 +4,7 @@ AM_CPPFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
-	$(LIBSNTL_CFLAGS) -I../include \
-	-I/include -I../../libtdata/include/ \
-	-I../../libsexpr/include/
+	$(LIBSNTL_CFLAGS) -I../include 
 
 AM_CFLAGS =\
 	 -Wall\
@@ -20,8 +18,6 @@ libsntl_la_SOURCES = \
 
 libsntl_la_LDFLAGS = 
 
-
-
 libsntl_la_LIBADD = -lpthread -lcrypto $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) 
 
 if BUILD_WIN32