7 files changed, 11 insertions, 9 deletions
diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index d9540e656..44501c0d0 100644
--- a/src/libcharon/Makefile.am
+++ b/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
diff --git a/src/libstrongswan/plugins/addrblock/Makefile.am b/src/libcharon/plugins/addrblock/Makefile.am
index 159d2e781..d844674ff 100644
--- a/src/libstrongswan/plugins/addrblock/Makefile.am
+++ b/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
 
diff --git a/src/libstrongswan/plugins/addrblock/addrblock_plugin.c b/src/libcharon/plugins/addrblock/addrblock_plugin.c
index 6c1ef73e4..6c1ef73e4 100644
--- a/src/libstrongswan/plugins/addrblock/addrblock_plugin.c
+++ b/src/libcharon/plugins/addrblock/addrblock_plugin.c
diff --git a/src/libstrongswan/plugins/addrblock/addrblock_plugin.h b/src/libcharon/plugins/addrblock/addrblock_plugin.h
index e7c3a728e..87bd516f9 100644
--- a/src/libstrongswan/plugins/addrblock/addrblock_plugin.h
+++ b/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
diff --git a/src/libstrongswan/plugins/addrblock/addrblock_validator.c b/src/libcharon/plugins/addrblock/addrblock_validator.c
index 44ef38d85..44ef38d85 100644
--- a/src/libstrongswan/plugins/addrblock/addrblock_validator.c
+++ b/src/libcharon/plugins/addrblock/addrblock_validator.c
diff --git a/src/libstrongswan/plugins/addrblock/addrblock_validator.h b/src/libcharon/plugins/addrblock/addrblock_validator.h
index 423f0d41a..423f0d41a 100644
--- a/src/libstrongswan/plugins/addrblock/addrblock_validator.h
+++ b/src/libcharon/plugins/addrblock/addrblock_validator.h
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 0ef26c831..eb0ceb530 100644
--- a/src/libstrongswan/Makefile.am
+++ b/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