Index: ext/libicpf/src/Makefile.am
===================================================================
diff -u -N -r2446443341715955423610c01b43fe7841a10e3e -rfd1f0cf4d6ad9ff63fd9252a3f2f31c992431842
--- ext/libicpf/src/Makefile.am	(.../Makefile.am)	(revision 2446443341715955423610c01b43fe7841a10e3e)
+++ ext/libicpf/src/Makefile.am	(.../Makefile.am)	(revision fd1f0cf4d6ad9ff63fd9252a3f2f31c992431842)
@@ -1,18 +1,16 @@
-lib_LTLIBRARIES = libicpf.la
-libicpf_la_SOURCES = callback.cpp exception.cpp circ_buffer.cpp \
-			str.cpp log.cpp dumpctx.cpp cfg.cpp str_help.cpp \
-			crc32.cpp file.cpp module.cpp conv.cpp crypt.cpp rijndael-alg-fst.c \
-			rijndael-api-fst.c sha256.c mutex.cpp
-
-# set the include path found by configure
-INCLUDES = $(all_includes)
-
-# the library search path.
-libicpf_la_LDFLAGS = $(all_libraries) 
-libicpf_la_LIBADD = -ldl -lpthread
-dist_include_HEADERS = callback.h exception.h str.h dumpctx.h cfg.h circ_buffer.h module.h \
-			file.h log.h cfg.h str_help.h crc32.h libicpf.h gen_types.h \
-			conv.h crypt.h err_codes.h gen_types.h macros.h mutex.h \
-			rijndael-alg-fst.h rijndael-api-fst.h sha256.h
-AM_CFLAGS = -Wall -Wshadow -DLIBICPF_EXPORTS
-AM_CXXFLAGS = -Wall -Wshadow -DLIBICPF_EXPORTS
+lib_LTLIBRARIES = libicpf.la
+libicpf_la_SOURCES = callback.cpp exception.cpp circ_buffer.cpp \
+			log.cpp dumpctx.cpp cfg.cpp cfg_xml.cpp config_property.cpp str_help.cpp \
+			crc32.cpp file.cpp module.cpp conv.cpp mutex.cpp
+
+# set the include path found by configure
+INCLUDES = $(all_includes)
+
+# the library search path.
+#libicpf_la_LDFLAGS = $(all_libraries) 
+libicpf_la_LIBADD = -ldl -lpthread
+dist_include_HEADERS = callback.h exception.h dumpctx.h cfg.h circ_buffer.h module.h \
+			file.h log.h cfg.h config_base.h config_property.h str_help.h crc32.h libicpf.h gen_types.h \
+			conv.h err_codes.h gen_types.h macros.h mutex.h
+AM_CFLAGS = -Wall -Wshadow -DLIBICPF_EXPORTS
+AM_CXXFLAGS = -Wall -Wshadow -DLIBICPF_EXPORTS