[netfilter-cvslog] r4287 - in trunk/conntrack: . extensions

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-09-23 22:16:33 +0200 (Fri, 23 Sep 2005)
New Revision: 4287

Modified:
   trunk/conntrack/Makefile.am
   trunk/conntrack/configure.in
   trunk/conntrack/extensions/Makefile.am
Log:
make sure we build against KERELDIR!


Modified: trunk/conntrack/Makefile.am
===================================================================
--- trunk/conntrack/Makefile.am	2005-09-23 19:40:46 UTC (rev 4286)
+++ trunk/conntrack/Makefile.am	2005-09-23 20:16:33 UTC (rev 4287)
@@ -1,6 +1,6 @@
 # not a GNU package. You can remove this line, if
 # have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.8
 
 INCLUDES  = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
 SUBDIRS   = src extensions

Modified: trunk/conntrack/configure.in
===================================================================
--- trunk/conntrack/configure.in	2005-09-23 19:40:46 UTC (rev 4286)
+++ trunk/conntrack/configure.in	2005-09-23 20:16:33 UTC (rev 4287)
@@ -74,10 +74,10 @@
                               [ Show location of kernel source. Default is to use uname -r and look in /lib/modules/KERNEL/build/include. ]),
 	       NF_KERNEL_SOURCE($with_kernel),NF_KERNEL_SOURCE())
 
-if test ! -z "$libdir"; then
-   MODULE_DIR="\\\"$libdir/\\\""
-   CFLAGS="$CFLAGS -DCONNTRACK_LIB_DIR=$MODULE_DIR"
-fi
+#if test ! -z "$libdir"; then
+#   MODULE_DIR="\\\"$libdir/\\\""
+#   CFLAGS="$CFLAGS -DCONNTRACK_LIB_DIR=$MODULE_DIR"
+#fi
 
 dnl--------------------------------
 

Modified: trunk/conntrack/extensions/Makefile.am
===================================================================
--- trunk/conntrack/extensions/Makefile.am	2005-09-23 19:40:46 UTC (rev 4286)
+++ trunk/conntrack/extensions/Makefile.am	2005-09-23 20:16:33 UTC (rev 4287)
@@ -4,7 +4,7 @@
 
 man_MANS =
 
-INCLUDES=-I../include -I/lib/modules/$(shell (uname -r))/build/include
+INCLUDES=-I../include -I${KERNELDIR}
 CFLAGS=-fPIC -Wall
 LIBS=