Scheduler and processor have been moved to libstrongswan.

Also reverts 0c21dc000d as the dependency
to libcharon is no longer required.

src/libcharon/plugins/ha/ha_cache.c

@@ -354,7 +354,7 @@ ha_cache_t *ha_cache_create(ha_kernel_t *kernel, ha_socket_t *socket,
 	if (sync)
 	{
 		/* request a resync as soon as we are up */
-		charon->scheduler->schedule_job(charon->scheduler, (job_t*)
+		lib->scheduler->schedule_job(lib->scheduler, (job_t*)
 						callback_job_create((callback_job_cb_t)request_resync,
 											this, NULL, NULL), 1);
 	}

src/libstrongswan/plugins/pkcs11/Makefile.am

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

src/libstrongswan/plugins/pkcs11/pkcs11_manager.c

@@ -21,7 +21,6 @@
 
 #include "pkcs11_library.h"
 
-#include <daemon.h>
 #include <processing/jobs/callback_job.h>
 
 typedef struct private_pkcs11_manager_t private_pkcs11_manager_t;
@@ -392,7 +391,7 @@ pkcs11_manager_t *pkcs11_manager_create(pkcs11_manager_token_event_t cb,
 		query_slots(entry);
 		entry->job = callback_job_create((void*)dispatch_slot_events,
 										 entry, (void*)end_dispatch, NULL);
-		charon->processor->queue_job(charon->processor, (job_t*)entry->job);
+		lib->processor->queue_job(lib->processor, (job_t*)entry->job);
 	}
 	enumerator->destroy(enumerator);