diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-08-01 19:36:01 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-08-01 19:38:01 +0200 |
| commit | f9ad41077c473884f33c6677f81119614d5a8eb2 (patch) | |
| tree | 6dc50dc4965edcc50280d25493ea7da702562ef0 | |
| parent | ff5eb25aa6963536e3f640c5c38c341ce02809bb (diff) | |
| download | conntrack-tools-f9ad41077c473884f33c6677f81119614d5a8eb2.tar.gz conntrack-tools-f9ad41077c473884f33c6677f81119614d5a8eb2.zip | |
nfct: helper: use CONNTRACKD_LIB_DIR variable set during configuration
Instead of hardcoded path to /usr/lib/conntrack-tools/ which might
not be true if options like --prefix with different location is
passed to conntrack.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/nfct-extensions/helper.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 5d1860d..27ad01b 100644 --- a/configure.ac +++ b/configure.ac @@ -119,5 +119,10 @@ dnl debug/src/Makefile dnl extensions/Makefile dnl src/Makefile]) +if test ! -z "$libdir"; then + MODULE_DIR="\\\"$libdir/conntrack-tools/\\\"" + CFLAGS="$CFLAGS -DCONNTRACKD_LIB_DIR=$MODULE_DIR" +fi + AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/linux/Makefile include/linux/netfilter/Makefile extensions/Makefile src/helpers/Makefile]) AC_OUTPUT diff --git a/src/nfct-extensions/helper.c b/src/nfct-extensions/helper.c index e8f85bb..f91fc41 100644 --- a/src/nfct-extensions/helper.c +++ b/src/nfct-extensions/helper.c @@ -202,9 +202,7 @@ int nfct_cmd_helper_add(int argc, char *argv[]) return -1; } - /* XXX use prefix defined in configure.ac. */ - helper = helper_find("/usr/lib/conntrack-tools", - argv[3], l4proto, RTLD_LAZY); + helper = helper_find(CONNTRACKD_LIB_DIR, argv[3], l4proto, RTLD_LAZY); if (helper == NULL) { nfct_perror("that helper is not supported"); return -1; @@ -558,9 +556,7 @@ int nfct_cmd_helper_disable(int argc, char *argv[]) return -1; } - /* XXX use prefix defined in configure.ac. */ - helper = helper_find("/usr/lib/conntrack-tools", - argv[3], l4proto, RTLD_LAZY); + helper = helper_find(CONNTRACKD_LIB_DIR, argv[3], l4proto, RTLD_LAZY); if (helper == NULL) { nfct_perror("that helper is not supported"); return -1; |