Setting the snaplen option will now work for ring:

This feature was missing in the current implementation of ring:

Thanks to Nevil Brownlee for bringing this to our attention.
Made timestamp integrity testing more thorough

We now test timestamp conversion across multiple formats.

Fixed timestamp difference check so that it would not allow
large negative values to count as successes.
Fix hard-coded call to gcc in GCC version check

FreeBSD 10 does not have gcc by default, but the clang compiler does support GCC
features. Replaced the hard-coded gcc command with $CC.
Tested on FreeBSD 10, Ubuntu 12.04.4 and Mac OSX 10.9.3
Allow a bit more leeway in the test-time unit test

Floating point division is not particularly precise on some
systems...
Merge branch 'fix_gcc_version_check' of https://github.com/alistairking/libtrace into develop
Fixed broken -fvisibility check in configure

 * Added a m4 script that does this properly rather than our hax
   gcc version check.
 * Tidied up CFLAGS in configure so we aren't adding the same sets of
   flags multiple times
 * Created a wandio_internal.h file for storing global variables that
   shouldn't be made public

Thanks to Alistair King, whose patch to try and make this work for
non-gcc systems brought my attention to just how broken this was :)
Forgot to update lzo to include new wandio header
Merge branch 'gccvisibility' into develop
Added m4 macros to check for gcc compiler attributes

Instead of relying on __GNUC__, we now individually check
whether each attribute is supported by the C compiler and set
preprocessor macros accordingly.

Removed similar attribute definitions from wandio.h, as these are
not used at all by libwandio.
Fixed missing AC_LANG_SOURCE from the new m4 macros.

More recent autoconfs are quite strict about this compared with
whatever is in Debian Squeeze.
Replace INCLUDES with AM_CPPFLAGS in Makefile.am's

Again, newer autotools versions complain about using these
outdated terms.
Add subdir-objects option to automake

Seems to be another thing that autotools likes to complain about.
Merge branch 'moregccattrs' into develop
Automatically scale threads to the number of available CPU cores on Linux.
Add a generic test for the parallel system to test all the file based formats, all of which will be using emulation within the library to create the threads.
Fix some BSD warnings/errors
Merge remote-tracking branch 'upsteam/develop' into develop

Conflicts:
	lib/Makefile.am
	lib/libtrace_int.h
Removes the missed HAVE_VISIBILITY dependency on config.h for libtrace.h
Remove inlines for BSD support
Merge branch 'MergingUpstream' into develop