Merge branch 'devel'

Author: Petr Velan

Makefile.am

@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = README.md LICENSE docker
+EXTRA_DIST = README.md LICENSE docker ansible
 
 SUBDIRS = base \
 	tools/fbitconvert \
@@ -22,3 +22,6 @@ SUBDIRS = base \
 	plugins/intermediate/uid
 
 # plugins/storage/unirec is not added to SUBDIRS due to its dependency on libtrap
+# plugins/storage/libnf is not added to SUBDIRS due to its dependency on libnf
+# plugins/input/udp_cpg is not added to SUBDIRS due to its dependency on libcpg
+

base/configure.ac

@@ -40,7 +40,7 @@ AC_PREREQ([2.60])
 
 # Process this file with autoconf to produce a configure script.
 AC_INIT([ipfixcol], [0.9.1])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability subdir-objects])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability subdir-objects tar-ustar])
 LT_PREREQ([2.2])
 LT_INIT([dlopen disable-static])
 

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ([2.60])
 AC_INIT([ipfixcol-projects], [1.0])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability tar-ustar])
 LT_PREREQ([2.2])
 LT_INIT([dlopen])