From f69968a60146d1594e62a0b9794e2862ea6dc115 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 13 Jul 2010 23:03:24 -0300 Subject: [PATCH] Add some extra autoconf/automake magic for iptables library --- Makefile.am | 4 ++-- configure.ac | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 96d7a3e..aa30177 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 6514483..f137749 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) -- 2.7.4