summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in35
-rw-r--r--include/Makefile.am2
2 files changed, 1 insertions, 36 deletions
diff --git a/configure.in b/configure.in
index 22c97f7..e0e046a 100644
--- a/configure.in
+++ b/configure.in
@@ -38,41 +38,6 @@ dnl AC_CHECK_FUNCS([memset])
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())
-
if test ! -z "$libdir"; then
MODULE_DIR="\\\"$libdir/conntrack/\\\""
CFLAGS="$CFLAGS -DCONNTRACK_LIB_DIR=$MODULE_DIR"
diff --git a/include/Makefile.am b/include/Makefile.am
index 832da6d..ef7ce45 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,2 +1,2 @@
-pkginclude_HEADERS = conntrack.h linux_list.h
+noinst_HEADERS = conntrack.h linux_list.h