diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-07-13 23:03:24 -0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-07-13 23:03:24 -0300 |
| commit | f69968a60146d1594e62a0b9794e2862ea6dc115 (patch) | |
| tree | 94c7cab80649981bdcf90b14bd80a465e717bb96 | |
| parent | 0378026fe391c3312b2ad263af77c2f5639c5dd8 (diff) | |
| download | connman-f69968a60146d1594e62a0b9794e2862ea6dc115.tar.gz connman-f69968a60146d1594e62a0b9794e2862ea6dc115.tar.bz2 connman-f69968a60146d1594e62a0b9794e2862ea6dc115.zip | |
Add some extra autoconf/automake magic for iptables library
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 96d7a3ed..aa30177b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,7 +88,7 @@ build_plugindir = $(plugindir) build_scriptdir = $(scriptdir) endif -AM_CFLAGS = @UDEV_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \ +AM_CFLAGS = @UDEV_CFLAGS@ @IPTC_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \ @DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ @@ -136,7 +136,7 @@ tools_polkit_test_LDADD = @DBUS_LIBS@ tools_portal_test_LDADD = @GLIB_LIBS@ -tools_iptables_test_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@ -liptc -lxtables +tools_iptables_test_LDADD = @IPTC_LIBS@ -lip4tc -lxtables endif test_scripts = test/get-state test/list-profiles test/list-services \ diff --git a/configure.ac b/configure.ac index 65144834..f1377491 100644 --- a/configure.ac +++ b/configure.ac @@ -347,6 +347,11 @@ AM_CONDITIONAL(CLIENT, test "${enable_client}" = "yes") AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], [enable testing tools]), [enable_tools=${enableval}]) if (test "${enable_tools}" = "yes"); then + PKG_CHECK_MODULES(IPTC, libiptc, dummy=yes, + AC_MSG_ERROR(iptables library is required)) + AC_SUBST(IPTC_CFLAGS) + AC_SUBST(IPTC_LIBS) + PKG_CHECK_MODULES(NETLINK, libnl-1, dummy=yes, AC_MSG_ERROR(Netlink library is required)) AC_SUBST(NETLINK_CFLAGS) |