make IMC/IMV pairs independent of libcharon

src/libcharon/plugins/tnc_imv/Makefile.am

@@ -1,6 +1,6 @@
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-	-I$(top_srcdir)/src/libcharon
+	-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libtncif
 
 AM_CFLAGS = -rdynamic
 
@@ -8,6 +8,7 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-tnc-imv.la
 else
 plugin_LTLIBRARIES = libstrongswan-tnc-imv.la
+libstrongswan_tnc_imv_la_LIBADD = $(top_builddir)/src/libtncif/libtncif.la
 endif
 
 libstrongswan_tnc_imv_la_SOURCES = \

src/libcharon/plugins/tnc_imv/tnc_imv_manager.c

@@ -17,7 +17,8 @@
 #include "tnc_imv_recommendations.h"
 
 #include <tnc/imv/imv_manager.h>
-#include <tnc/tncifimv.h>
+
+#include <tncifimv.h>
 
 #include <debug.h>
 #include <daemon.h>

src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c

@@ -14,7 +14,9 @@
 
 #include <debug.h>
 #include <daemon.h>
-#include <tnc/tncifimv.h>
+
+#include <tncifimv.h>
+
 #include <tnc/imv/imv.h>
 #include <tnc/imv/imv_recommendations.h>