summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org>2005-11-14 14:46:05 +0000
committer/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org>2005-11-14 14:46:05 +0000
commit1fb834fd7c2784d9bf2c70832af8b55d560a968e (patch)
tree14e41ca1bc33e1ad05a992b2de3c4373dc2810b2
parenta2eb0c879889fff98b513d4eb7c82762a3ea5201 (diff)
o It define NETLINK_NETFILTER if it's not defined.
o Kill KERNELDIR in Makefile.am, it's not set anymore. (Pablo Neira)
-rw-r--r--include/libnfnetlink/libnfnetlink.h6
-rw-r--r--src/Makefile.am2
2 files changed, 7 insertions, 1 deletions
diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h
index 8b321ac..982c1b6 100644
--- a/include/libnfnetlink/libnfnetlink.h
+++ b/include/libnfnetlink/libnfnetlink.h
@@ -4,6 +4,8 @@
*
* 2005-10-29 Pablo Neira Ayuso <pablo@netfilter.org>:
* Fix NFNL_HEADER_LEN
+ * 2005-11-13 Pablo Neira Ayuso <pablo@netfilter.org>:
+ * Define NETLINK_NETFILTER if it's undefined
*/
#ifndef __LIBNFNETLINK_H
@@ -18,6 +20,10 @@
#include <linux/netlink.h>
#include <libnfnetlink/linux_nfnetlink.h>
+#ifndef NETLINK_NETFILTER
+#define NETLINK_NETFILTER 12
+#endif
+
#define NLMSG_TAIL(nlh) \
(((void *) (nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len))
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a604fb..16340c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
#EXTRA_DIST = $(man_MANS) acinclude.m4
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS=-fPIC -Wall
LIBS=