diff options
| author | /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> | 2005-07-30 09:31:09 +0000 |
|---|---|---|
| committer | /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> | 2005-07-30 09:31:09 +0000 |
| commit | 2dc1bb24e029f3d57d829709743c6eb0206ca913 (patch) | |
| tree | 6aef43db61a5e45fd02510d31bddc7fdb2bda3d1 | |
| parent | fa7f743c4e868436bdc5e26312ae8e6979bd50a5 (diff) | |
fix detection/usage of kernel include path
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/Makefile | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/configure.in b/configure.in index a907241..ca25c1a 100644 --- a/configure.in +++ b/configure.in @@ -7,8 +7,10 @@ AC_CANONICAL_SYSTEM 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 @@ AC_CHECK_LIB([nfnetlink], [nfnl_listen]) -dnl Output the makefile -AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile) - dnl-------------------------------- AC_DEFUN([NF_KERNEL_SOURCE],[ @@ -60,11 +59,9 @@ AC_ARG_WITH(kernel, [ 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) + diff --git a/src/Makefile.am b/src/Makefile.am index 256770d..9593d92 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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= diff --git a/utils/Makefile b/utils/Makefile index 9a1336e..4603cbe 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -71,7 +71,7 @@ INSTALL_DATA = ${INSTALL} -m 644 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 |