[netfilter-cvslog] r4180 - in trunk/libnfnetlink_log: . src utils

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-07-30 11:31:09 +0200 (Sat, 30 Jul 2005)
New Revision: 4180

Modified:
   trunk/libnfnetlink_log/configure.in
   trunk/libnfnetlink_log/src/Makefile.am
   trunk/libnfnetlink_log/utils/Makefile
Log:
fix detection/usage of kernel include path


Modified: trunk/libnfnetlink_log/configure.in
===================================================================
--- trunk/libnfnetlink_log/configure.in	2005-07-29 13:51:55 UTC (rev 4179)
+++ trunk/libnfnetlink_log/configure.in	2005-07-30 09:31:09 UTC (rev 4180)
@@ -7,8 +7,10 @@
 AM_INIT_AUTOMAKE(libnfnetlink_log, 0.10)
 
 AC_PROG_CC
-AC_EXEEXT
 AM_PROG_LIBTOOL
+AC_PROG_INSTALL
+AC_PROG_LN_S
+
 AC_SUBST(LIBTOOL_DEPS)
 
 case $target in 
@@ -20,9 +22,6 @@
 
 
 
-dnl Output the makefile
-AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile)
-
 dnl--------------------------------
 
 AC_DEFUN([NF_KERNEL_SOURCE],[
@@ -60,11 +59,9 @@
                               [ 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
-
 dnl--------------------------------
 
 
+dnl Output the makefile
+AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile)
+

Modified: trunk/libnfnetlink_log/src/Makefile.am
===================================================================
--- trunk/libnfnetlink_log/src/Makefile.am	2005-07-29 13:51:55 UTC (rev 4179)
+++ trunk/libnfnetlink_log/src/Makefile.am	2005-07-30 09:31:09 UTC (rev 4180)
@@ -2,7 +2,7 @@
 
 #EXTRA_DIST = $(man_MANS) acinclude.m4
 
-INCLUDES=-I../include -I/lib/modules/$(shell (uname -r))/build/include
+INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} 
 AM_CFLAGS=-fPIC -Wall
 LIBS=
 

Modified: trunk/libnfnetlink_log/utils/Makefile
===================================================================
--- trunk/libnfnetlink_log/utils/Makefile	2005-07-29 13:51:55 UTC (rev 4179)
+++ trunk/libnfnetlink_log/utils/Makefile	2005-07-30 09:31:09 UTC (rev 4180)
@@ -71,7 +71,7 @@
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-KERNELDIR = @KERNELDIR@
+KERNELDIR = /lib/modules/2.6.13-rc3gm1/build/include
 LDFLAGS = 
 LIBOBJS = 
 LIBS = -lnfnetlink