From f1295c5587345751c79b0247f68655c826ae052f 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" Date: Fri, 23 Sep 2005 20:16:33 +0000 Subject: make sure we build against KERELDIR! --- Makefile.am | 2 +- configure.in | 8 ++++---- extensions/Makefile.am | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index b114b00..1cec4aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.8 INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} SUBDIRS = src extensions diff --git a/configure.in b/configure.in index 8956e34..cd8f37f 100644 --- a/configure.in +++ b/configure.in @@ -74,10 +74,10 @@ 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 +#if test ! -z "$libdir"; then +# MODULE_DIR="\\\"$libdir/\\\"" +# CFLAGS="$CFLAGS -DCONNTRACK_LIB_DIR=$MODULE_DIR" +#fi dnl-------------------------------- diff --git a/extensions/Makefile.am b/extensions/Makefile.am index ecd3a91..ad48e09 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = $(man_MANS) acinclude.m4 man_MANS = -INCLUDES=-I../include -I/lib/modules/$(shell (uname -r))/build/include +INCLUDES=-I../include -I${KERNELDIR} CFLAGS=-fPIC -Wall LIBS= -- cgit v1.2.3