moved enumerator from libappserv to libstrongswan

src/libstrongswan/Makefile.am

@@ -50,6 +50,7 @@ utils/iterator.h \
 utils/leak_detective.c utils/leak_detective.h \
 utils/lexparser.c utils/lexparser.h \
 utils/linked_list.c utils/linked_list.h \
+utils/enumerator.c utils/enumerator.h \
 utils/optionsfrom.c utils/optionsfrom.h \
 utils/randomizer.c utils/randomizer.h
 

src/manager/Makefile.am

@@ -15,7 +15,7 @@ lib_LTLIBRARIES = libappserv.la
 libappserv_la_SOURCES = \
 lib/context.h lib/dispatcher.c lib/request.h lib/session.h \
 lib/controller.h lib/dispatcher.h lib/request.c lib/session.c \
-lib/xml.h lib/xml.c lib/enumerator.h lib/enumerator.c
+lib/xml.h lib/xml.c 
 
 libappserv_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lfcgi -lpthread -lneo_cgi -lneo_cs -lneo_utl ${xml_LIBS}
 

src/manager/database.c

@@ -24,7 +24,6 @@
 
 #include <sqlite3.h>
 #include <library.h>
-#include <enumerator.h>
 #include <crypto/hashers/hasher.h>
 
 

src/manager/database.h

@@ -23,7 +23,7 @@
 #ifndef DATABASE_H_
 #define DATABASE_H_
 
-#include <enumerator.h>
+#include <utils/enumerator.h>
 
 
 typedef struct database_t database_t;

src/manager/gateway.h

@@ -24,7 +24,7 @@
 #define GATEWAY_H_
 
 #include <utils/host.h>
-#include <enumerator.h>
+#include <utils/enumerator.h>
 
 typedef struct gateway_t gateway_t;
 

src/manager/lib/xml.h

@@ -23,7 +23,7 @@
 #ifndef XML_H_
 #define XML_H_
 
-#include <enumerator.h>
+#include <utils/enumerator.h>
 
 typedef struct xml_t xml_t;