From f7b871cd5fed1f2de5509e69cf7cd91e23e87a43 Mon Sep 17 00:00:00 2001
From: "/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>
Date: Fri, 11 Nov 2005 16:52:51 +0000
Subject: don't use kernel headers installed on system, but include our own
 linux_nnfnetlink_conntrack.h

---
 configure.in | 42 +-----------------------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 6a55a53..5a02570 100644
--- a/configure.in
+++ b/configure.in
@@ -19,53 +19,13 @@ case $target in
 esac
 
 AC_CHECK_LIB([nfnetlink], [nfnl_listen])
-
-
-
-dnl--------------------------------
-
-AC_DEFUN([NF_KERNEL_SOURCE],[
-    
-  if test "$with_kernel" = ""; then
-    KERNEL="`uname -r`"
-  else
-    KERNEL="$with_kernel"
-  fi
-
-  THIS_PREFIX=""
-  for i in "/lib/modules/$KERNEL/build/include" "$KERNEL" "$KERNEL/include" "/usr/src/linux-$KERNEL" "/usr/src/kernel-$KERNEL" "/usr/src/linux-headers-$KERNEL" "/usr/src/kernel-headers-$KERNEL"
-  do  
-    AC_MSG_CHECKING([Looking for kernel source or headers in $i])
-    if test -r "$i/linux/config.h"
-    then
-      THIS_PREFIX="$i"
-      AC_MSG_RESULT([found])
-      break
-    fi
-    AC_MSG_RESULT([ ])    
-  done
-  if test -r "$THIS_PREFIX/linux/config.h" ; then
-    AC_SUBST(KERNELDIR,[$THIS_PREFIX])
-    AC_MSG_RESULT([found])
-  else
-    AC_MSG_ERROR([not found $THIS_PREFIX])  
-  fi
-
-  # somehow add this as an include path
-])
-
-AC_ARG_WITH(kernel,
-               AC_HELP_STRING([--with-kernel=DIR],
-                              [ 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())
+AC_CHECK_HEADER([libnfnetlink/linux_nfnetlink.h], [AC_MSG_RESULT([found])], [AC_MSG_ERROR([libnfnetlink 0.0.11 or later needed])])
 
 if test ! -z "$libdir"; then
 	MODULE_DIR="\\\"$libdir/libnetfilter_conntrack/\\\""
 	CFLAGS="$CFLAGS -DLIBNETFILTER_CONNTRACK_DIR=$MODULE_DIR"
 fi
 
-dnl--------------------------------
-
 
 dnl Output the makefile
 AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile include/libnetfilter_conntrack/Makefile extensions/Makefile)
-- 
cgit v1.2.3