configure: Use pkg-config to detect libiptc used by connmark/forecast

This ensures the library is available.  On Debian/Ubuntu it is a dynamic
library provided by the iptables-dev package.

diff --git a/configure.ac b/configure.ac
index cb47c69bd563c8a94bb4d07c79d6dd4b1434c3cc..f1e50465106a0596344f3dda807bf79c3e50d92a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1078,6 +1078,12 @@ if test x$xauth_pam = xtrue; then
        AC_CHECK_HEADER([security/pam_appl.h],,[AC_MSG_ERROR([PAM header security/pam_appl.h not found!])])
 fi
 
+if test x$connmark = xtrue -o x$forecast = xtrue; then
+       PKG_CHECK_MODULES(libiptc, [libiptc])
+       AC_SUBST(libiptc_CFLAGS)
+       AC_SUBST(libiptc_LIBS)
+fi
+
 if test x$capabilities = xnative; then
        AC_MSG_NOTICE([Usage of the native Linux capabilities interface is deprecated, use libcap instead])
        # Linux requires the following for capset(), Android does not have it,

diff --git a/src/libcharon/plugins/connmark/Makefile.am b/src/libcharon/plugins/connmark/Makefile.am
index c70f529cee04269e7b6da36f2fc13743fb85fd91..cc4d0ec8d584ec4c264b19681900ef9979231124 100644 (file)
--- a/src/libcharon/plugins/connmark/Makefile.am
+++ b/src/libcharon/plugins/connmark/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
-       $(PLUGIN_CFLAGS)
+       $(PLUGIN_CFLAGS) $(libiptc_CFLAGS)
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-connmark.la
@@ -17,4 +17,4 @@ libstrongswan_connmark_la_SOURCES = \
        connmark_plugin.h connmark_plugin.c
 
 libstrongswan_connmark_la_LDFLAGS = -module -avoid-version
-libstrongswan_connmark_la_LIBADD = -lip4tc
+libstrongswan_connmark_la_LIBADD = $(libiptc_LIBS)

diff --git a/src/libcharon/plugins/forecast/Makefile.am b/src/libcharon/plugins/forecast/Makefile.am
index fc08eecc43ebfdca09fb7ee530c59f95ebaef621..ce573135d621364575915f7c391eafd05e339bce 100644 (file)
--- a/src/libcharon/plugins/forecast/Makefile.am
+++ b/src/libcharon/plugins/forecast/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
-       $(PLUGIN_CFLAGS)
+       $(PLUGIN_CFLAGS) $(libiptc_CFLAGS)
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-forecast.la
@@ -18,4 +18,4 @@ libstrongswan_forecast_la_SOURCES = \
        forecast_plugin.h forecast_plugin.c
 
 libstrongswan_forecast_la_LDFLAGS = -module -avoid-version
-libstrongswan_forecast_la_LIBADD  = -lip4tc
+libstrongswan_forecast_la_LIBADD = $(libiptc_LIBS)