merge latest master containing autoconf macro cleanup and better cross-compilation...

diff --cc Makefile.am
index 08cf945677dd5f8eb6fdc1205da4cc20ad4062fd,6bbe22f5adf8b2f998a7a61601933c2f2d1df9cd..74a2472815a007854b880b979cddca9683319155
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -146,7 -135,4 +155,7 @@@ uninstall-hook
        @echo
  
  clean-local:
-       -rm -fr coverage *.lcov *.gz test*.log test*.xml src/*.gc* tests/*.gc*
+       -rm -fr coverage *.lcov *.gz test*.log test*.xml src/*.gc* tests/*.gc* *.old *.new
 +
 +check-local:
 +      -tail -n 2 test.log

diff --cc Makefile.in
index 34350aeeb99b5a196a12f20c968fdfd3aca455b7,c34bb97983e22ba64dbba2b2fc5884a115473d63..af9716e0e3dc273a30fc0ec4bcb9c8f4a08af117
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -76,7 -76,11 +76,9 @@@ POST_INSTALL = 
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
 -bin_PROGRAMS = vnstat$(EXEEXT) $(am__EXEEXT_1)
+ build_triplet = @build@
+ host_triplet = @host@
  sbin_PROGRAMS = vnstatd$(EXEEXT)
 -@HAVE_LIBGD_TRUE@am__append_1 = vnstati
  @HAVE_CHECK_TRUE@TESTS = check_vnstat$(EXEEXT)
  @HAVE_CHECK_TRUE@check_PROGRAMS = check_vnstat$(EXEEXT)
  subdir = .
@@@ -1943,11 -2090,8 +1960,11 @@@ uninstall-hook
        @echo
  
  clean-local:
-       -rm -fr coverage *.lcov *.gz test*.log test*.xml src/*.gc* tests/*.gc*
+       -rm -fr coverage *.lcov *.gz test*.log test*.xml src/*.gc* tests/*.gc* *.old *.new
  
 +check-local:
 +      -tail -n 2 test.log
 +
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/config.h.in
Simple merge