Moved addrblock plugin to libcharon

src/libcharon/Makefile.am

@@ -400,6 +400,14 @@ if MONOLITHIC
 endif
 endif
 
+if USE_ADDRBLOCK
+  SUBDIRS += plugins/addrblock
+  PLUGINS += addrblock
+if MONOLITHIC
+  libcharon_la_LIBADD += plugins/uci/libstrongswan-addrblock.la
+endif
+endif
+
 if USE_UNIT_TESTS
   SUBDIRS += plugins/unit_tester
   PLUGINS += unit-tester

src/libcharon/plugins/addrblock/Makefile.am

@@ -1,5 +1,6 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+	-I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 

src/libcharon/plugins/addrblock/addrblock_plugin.h

@@ -15,7 +15,7 @@
 
 /**
  * @defgroup addrblock addrblock
- * @ingroup plugins
+ * @ingroup cplugins
  *
  * @defgroup addrblock_plugin addrblock_plugin
  * @{ @ingroup addrblock

src/libstrongswan/Makefile.am

@@ -314,13 +314,6 @@ if MONOLITHIC
 endif
 endif
 
-if USE_ADDRBLOCK
-  SUBDIRS += plugins/addrblock
-if MONOLITHIC
-  libstrongswan_la_LIBADD += plugins/addrblock/libstrongswan-addrblock.la
-endif
-endif
-
 if USE_TEST_VECTORS
   SUBDIRS += plugins/test_vectors
 if MONOLITHIC