From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 14 Jul 2010 02:03:24 +0000 (-0300)
Subject: Add some extra autoconf/automake magic for iptables library
X-Git-Tag: 2.0_alpha~2654
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f69968a60146d1594e62a0b9794e2862ea6dc115;p=framework%2Fconnectivity%2Fconnman.git

Add some extra autoconf/automake magic for iptables library
---

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)