6 files changed, 20 insertions, 9 deletions
diff --git a/output/Makefile.am b/output/Makefile.am
index 4c7d8bc..9a966d2 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,8 +1,7 @@
-
-SUBDIRS = pcap mysql pgsql
-
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
-LIBS=
+LIBS=""
+
+SUBDIRS= pcap mysql pgsql sqlite3
 
 pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \
 		     ulogd_output_OPRINT.la ulogd_output_IPFIX.la
diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am
index 3684ec3..35ebd63 100644
--- a/output/mysql/Makefile.am
+++ b/output/mysql/Makefile.am
@@ -1,9 +1,11 @@
-
-INCLUDES = $(all_includes) $(MYSQL_INC)
+INCLUDES = $(all_includes) -I$(top_srcdir)/include $(MYSQL_INC)
 LIBS=$(MYSQL_LIB)
 
+if HAVE_MYSQL
+
 pkglib_LTLIBRARIES = ulogd_output_MYSQL.la
 
 ulogd_output_MYSQL_la_SOURCES = ulogd_output_MYSQL.c ../../util/db.c
 ulogd_output_MYSQL_la_LDFLAGS = -module
 
+endif
diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am
index f2d9a67..98a222b 100644
--- a/output/pcap/Makefile.am
+++ b/output/pcap/Makefile.am
@@ -1,9 +1,12 @@
 
-INCLUDES = $(all_includes) $(PCAP_INC)
+INCLUDES = $(all_includes) -I$(top_srcdir)/include $(PCAP_INC)
 LIBS=$(PCAP_LIB)
 
+if HAVE_PCAP
+
 pkglib_LTLIBRARIES = ulogd_output_PCAP.la
 
 ulogd_output_PCAP_la_SOURCES = ulogd_output_PCAP.c
 ulogd_output_PCAP_la_LDFLAGS = -module
 
+endif
diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am
index 6e2a6a4..5452455 100644
--- a/output/pgsql/Makefile.am
+++ b/output/pgsql/Makefile.am
@@ -2,8 +2,11 @@
 INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(PQINCPATH)
 LIBS=$(PQLIBS)
 
+if HAVE_PGSQL
+
 pkglib_LTLIBRARIES = ulogd_output_PGSQL.la
 
 ulogd_output_PGSQL_la_SOURCES = ulogd_output_PGSQL.c ../../util/db.c
 ulogd_output_PGSQL_la_LDFLAGS = -module
 
+endif
diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am
index 0760814..9920c22 100644
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -1,9 +1,11 @@
-
-INCLUDES = $(all_includes) $(SQLITE3_INC)
+INCLUDES = $(all_includes) -I$(top_srcdir)/include $(SQLITE3_INC)
 LIBS=$(SQLITE3_LIB)
 
+if HAVE_SQLITE3
+
 pkglib_LTLIBRARIES = ulogd_output_SQLITE3.la
 
 ulogd_output_SQLITE3_la_SOURCES = ulogd_output_SQLITE3.c ../../util/db.c
 ulogd_output_SQLITE3_la_LDFLAGS = -module
 
+endif
diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c
index 4c9caeb..ba1b594 100644
--- a/output/sqlite3/ulogd_output_SQLITE3.c
+++ b/output/sqlite3/ulogd_output_SQLITE3.c
@@ -1,3 +1,4 @@
+#if 0
 /*
  * ulogd output plugin for logging to a SQLITE database
  *
@@ -410,3 +411,4 @@ void _init(void)
 	register_output(&_sqlite3_plugin);
 }
 
+#endif