[netfilter-cvslog] r4512 - in trunk/libnfnetlink: include/libnfnetlink src

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-14 15:46:05 +0100 (Mon, 14 Nov 2005)
New Revision: 4512

Modified:
   trunk/libnfnetlink/include/libnfnetlink/libnfnetlink.h
   trunk/libnfnetlink/src/Makefile.am
Log:
o It define NETLINK_NETFILTER if it's not defined.
o Kill KERNELDIR in Makefile.am, it's not set anymore.   (Pablo Neira)


Modified: trunk/libnfnetlink/include/libnfnetlink/libnfnetlink.h
===================================================================
--- trunk/libnfnetlink/include/libnfnetlink/libnfnetlink.h	2005-11-12 10:39:40 UTC (rev 4511)
+++ trunk/libnfnetlink/include/libnfnetlink/libnfnetlink.h	2005-11-14 14:46:05 UTC (rev 4512)
@@ -4,6 +4,8 @@
  *
  * 2005-10-29 Pablo Neira Ayuso <pablo at netfilter.org>:
  * 	Fix NFNL_HEADER_LEN
+ * 2005-11-13 Pablo Neira Ayuso <pablo at 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))
 

Modified: trunk/libnfnetlink/src/Makefile.am
===================================================================
--- trunk/libnfnetlink/src/Makefile.am	2005-11-12 10:39:40 UTC (rev 4511)
+++ trunk/libnfnetlink/src/Makefile.am	2005-11-14 14:46:05 UTC (rev 4512)
@@ -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=