summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org>2005-05-03 16:17:31 +0000
committer/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org>2005-05-03 16:17:31 +0000
commitc084b01462dc254cd44bff4cf0f486ee1e19cf1f (patch)
tree0f592fefe260af779590749a9877cfcb5ac67398
parentd894e26211f38db37015850afab6b7331edeecdb (diff)
Kill hardcoded CONNTRACK_LIB_DIR=/usr/local/lib, now it uses $prefix value
passed by autoshit.
-rw-r--r--configure.in6
-rw-r--r--include/libct_proto.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index 2cdeec7..468e759 100644
--- a/configure.in
+++ b/configure.in
@@ -74,8 +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())
-CONNTRACK_LIB_DIR=$PREFIX/lib
-AC_SUBST(CONNTRACK_LIB_DIR)
+if test ! -z "$libdir"; then
+ MODULE_DIR="\\\"$libdir/\\\""
+ CFLAGS="$CFLAGS -DCONNTRACK_LIB_DIR=$MODULE_DIR"
+fi
dnl--------------------------------
diff --git a/include/libct_proto.h b/include/libct_proto.h
index 1049cef..de632b2 100644
--- a/include/libct_proto.h
+++ b/include/libct_proto.h
@@ -6,8 +6,6 @@
#include "linux_list.h"
#include <getopt.h>
-#define CONNTRACK_LIB_DIR "/usr/local/lib"
-
struct cta_proto;
struct ctproto_handler {