[netfilter-cvslog] r4498 - in trunk/conntrack: . include

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-11 15:01:12 +0100 (Fri, 11 Nov 2005)
New Revision: 4498

Modified:
   trunk/conntrack/configure.in
   trunk/conntrack/include/Makefile.am
Log:
- don't install the header files when 'make install' is run. they're private
- don't check for kernel header files, since we don't include any.


Modified: trunk/conntrack/configure.in
===================================================================
--- trunk/conntrack/configure.in	2005-11-11 13:56:43 UTC (rev 4497)
+++ trunk/conntrack/configure.in	2005-11-11 14:01:12 UTC (rev 4498)
@@ -38,41 +38,6 @@
 
 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"

Modified: trunk/conntrack/include/Makefile.am
===================================================================
--- trunk/conntrack/include/Makefile.am	2005-11-11 13:56:43 UTC (rev 4497)
+++ trunk/conntrack/include/Makefile.am	2005-11-11 14:01:12 UTC (rev 4498)
@@ -1,2 +1,2 @@
 
-pkginclude_HEADERS = conntrack.h linux_list.h
+noinst_HEADERS = conntrack.h linux_list.h