Revert "ulogd: permit compilation of plugin outside of tree"

This reverts commit 0ff525cb0506b2c043bc9df6d7e7b486c865bc38. A stable
and clean API should be provided if we choose to offer for external
module capability.

diff --git a/include/Makefile.am b/include/Makefile.am
index 0e0b87ab1305dc6a74c5cf89b9d79f4a84190bbf..fa3447374ea1bd01db3e495c5b791c044db4702c 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,2 +1 @@
 SUBDIRS = ulogd libipulog
-nobase_include_HEADERS = ulogd/conffile.h ulogd/ipfix_protocol.h ulogd/linuxlist.h ulogd/ulogd.h ulogd/common.h ulogd/linux_rbtree.h ulogd/timer.h ulogd/slist.h ulogd/hash.h ulogd/jhash.h

diff --git a/include/ulogd/Makefile.am b/include/ulogd/Makefile.am
index de9c8f2b21eaa99db73c5ce54f319aa9c03f01f9..9b8a3d12d5f11eebe4a181a44abb53ad9b3122d5 100644 (file)
--- a/include/ulogd/Makefile.am
+++ b/include/ulogd/Makefile.am
@@ -1 +1,2 @@
-noinst_HEADERS = db.h printpkt.h printflow.h
+
+noinst_HEADERS = conffile.h db.h ipfix_protocol.h linuxlist.h ulogd.h printpkt.h printflow.h common.h linux_rbtree.h timer.h slist.h hash.h jhash.h

diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h
index 3069454062851dc21d68a026925c71b7b0c30f53..2d1b348dd82f198535e4abd1b3c5e3a03310b11b 100644 (file)
--- a/include/ulogd/ulogd.h
+++ b/include/ulogd/ulogd.h
@@ -19,9 +19,7 @@
 #include <signal.h>    /* need this because of extension-sighandler */
 #include <sys/types.h>
 #include <string.h>
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))