summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2010-10-25 14:53:04 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2010-10-25 14:53:04 +0200
commita68e0f336a746d6f23f6af1d2ce632069c671d17 (patch)
tree55f517b1b361a55d84029edb3850cb3ddb712fdb /configure.ac
parentf2a0643f55af5ac826c65706ee133dd251bccd05 (diff)
parenta2297acbaed4174f27a7caef98f2d84f9bde8c5c (diff)
Merge branch 'ipset-5' of git://dev.medozas.de/ipset into ipset-5
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac36
1 files changed, 20 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac
index 7622ac4..0bff332 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,9 @@
dnl Boilerplate
AC_INIT([ipset], [5.0], [kadlec@blackhole.kfki.hu])
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
+AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
dnl Shortcut: Linux supported alone
case $target in
@@ -12,10 +13,14 @@ esac
dnl Additional arguments
dnl Kernel build directory or source tree
-AC_ARG_WITH([kernel],
- AS_HELP_STRING([--with-kernel=PATH],
- [Path to kernel source/build directory]),
- [KBUILDDIR="$withval";])
+AC_ARG_WITH([kbuild],
+ AS_HELP_STRING([--with-kbuild=PATH],
+ [Path to kernel build directory]),
+ [KBUILDDIR="$withval";])
+AC_ARG_WITH([ksource],
+ AS_HELP_STRING([--with-ksource=PATH],
+ [Path to kernel source directory]),
+ [KSOURCEDIR="$withval";])
AM_CONDITIONAL(WITH_KBUILDDIR, test "$KBUILDDIR" != "")
AC_SUBST(KBUILDDIR)
@@ -27,9 +32,10 @@ else
kbuilddir="/lib/modules/`uname -r`/build"
fi
-if test ! -e "$kbuilddir/include/linux/netfilter/nfnetlink.h"
-then
- AC_MSG_ERROR([Invalid kernel build directory $kbuilddir])
+if test -n "$KSOURCEDIR"; then
+ ksourcedir="$KSOURCEDIR"
+else
+ ksourcedir="/lib/modules/$(uname -r)/source"
fi
if test ! -e "$kbuilddir/.config"
@@ -45,11 +51,11 @@ then
fi
dnl Check kernel dependencies: nfnetlink.h
-NFNL_CB_CONST="`./check_const $kbuilddir/include/linux/netfilter/nfnetlink.h`"
+NFNL_CB_CONST="`./check_const $ksourcedir/include/linux/netfilter/nfnetlink.h`"
AC_SUBST(NFNL_CB_CONST)
dnl Check kernel dependencies: netlink.h
-NETLINK_DUMP_CONST="`./check_const $kbuilddir/include/linux/netlink.h`"
+NETLINK_DUMP_CONST="`./check_const $ksourcedir/include/linux/netlink.h`"
AC_SUBST(NETLINK_DUMP_CONST)
dnl Maximal number of sets supported by the kernel, default 256
@@ -98,15 +104,13 @@ AM_CONDITIONAL([DISABLE_EXTRA_FLAGS], [test "x$extra_flags" = xno])
dnl Checks for programs
AC_PROG_CC
-AC_PROG_LIBTOOL
+AM_PROG_CC_C_O
+LT_INIT
AC_PROG_INSTALL
AC_PROG_LN_S
dnl Checks for libraries
-AC_CHECK_LIB([mnl], [mnl_socket_open])
-if test x"${ac_cv_lib_mnl_mnl_socket_open}" = xno; then
- AC_MSG_ERROR(libmnl not found)
-fi
+PKG_CHECK_MODULES([libmnl], [libmnl >= 1])
dnl Checks for header files