Merge branch 'master' into entry

Conflicts:

	Makefile.am
	atom/Makefile.am
	atom/entry.c
	configure.ac

Get atom entry implementation from libatom. Some changes needed in
headers and usage of it.

diff --cc atom/Makefile.am
index 6822b1e,6b8838a..8b2f66b
--- 1/atom/Makefile.am
--- 2/atom/Makefile.am
+++ b/atom/Makefile.am
@@@ -1,4 -1,3 +1,5 @@@
 -noinst_LTLIBRARIES = libatom.la
 +lib_LTLIBRARIES = libatom.la
- libatom_la_SOURCES = atom.c
- libatom_la_CFLAGS = $(XML_CFLAGS)
- libatom_la_LIBADD = $(XML_LIBS)
+ libatom_la_SOURCES = entry.c
+ libatom_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
++libatom_la_CFLAGS += $(XML_CFLAGS)
++libatom_la_LIBADD = $(GLIB_LIBS) $(XML_LIBS)

diff --cc configure.ac
index 988b9a9,42adda7..d2ad06d
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -4,6 -4,17 +4,18 @@@ AC_PROG_INSTAL
  AC_PROG_CC
  AM_PROG_CC_C_O
  AC_PROG_LIBTOOL
 +PKG_CHECK_MODULES(XML, libxml-2.0, , AC_MSG_ERROR(Could not find libxml2))
+ AM_PATH_GLIB_2_0(2.14.0, , AC_MSG_ERROR(Could not find GLib))
+ PKG_CHECK_MODULES(GIO, gio-2.0, , AC_MSG_ERROR(Could not find GIO))
  AC_OUTPUT(Makefile
-       src/Makefile)
+       src/Makefile
+       include/Makefile
+       include/atompub/Makefile
+       config/Makefile
+       backend/Makefile
+       backend/files/Makefile
+       backend/gio/Makefile
+       frontend/Makefile
+       frontend/cgi/Makefile
+       atom/Makefile
+       iri/Makefile)