Merge branch 'xfrm'

http://lists.infradead.org/pipermail/libnl/2014-June/001503.html

Signed-off-by: Thomas Haller <thaller@redhat.com>

Makefile.am

@@ -7,7 +7,8 @@ SUBDIRS = include lib man python tests
 pkgconfig_DATA = libnl-3.0.pc \
 		 libnl-route-3.0.pc \
 		 libnl-genl-3.0.pc \
-		 libnl-nf-3.0.pc
+		 libnl-nf-3.0.pc \
+		 libnl-xfrm-3.0.pc
 
 if ENABLE_CLI
 SUBDIRS += src

configure.ac

@@ -127,6 +127,7 @@ libnl-route-3.0.pc
 libnl-genl-3.0.pc
 libnl-nf-3.0.pc
 libnl-cli-3.0.pc
+libnl-xfrm-3.0.pc
 lib/Makefile
 include/Makefile
 src/Makefile

include/Makefile.am

@@ -93,7 +93,13 @@ nobase_libnlinclude_HEADERS = \
 	netlink/idiag/meminfo.h \
 	netlink/idiag/msg.h \
 	netlink/idiag/req.h \
-	netlink/idiag/vegasinfo.h
+	netlink/idiag/vegasinfo.h \
+	netlink/xfrm/ae.h \
+	netlink/xfrm/lifetime.h \
+	netlink/xfrm/sa.h \
+	netlink/xfrm/selector.h \
+	netlink/xfrm/sp.h \
+	netlink/xfrm/template.h
 
 if ENABLE_CLI
 nobase_libnlinclude_HEADERS += \
@@ -141,6 +147,7 @@ noinst_HEADERS = \
 	linux/pkt_sched.h \
 	linux/rtnetlink.h \
 	linux/snmp.h \
+	linux/xfrm.h \
 	linux/tc_ematch/tc_em_meta.h \
 	netlink-private/genl.h \
 	netlink-private/netlink.h \