Merge remote-tracking branch 'upstream/master'

Conflicts:
	configure.ac

diff --cc configure.ac
index e9f9784e9fde0c6456c0c7575b67120ac11cf12f,7477fa7c64a9b339f27be2a4b14f04082a3629e9..9343df263548c099ce6828a65a7442517975a4a8
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -13,7 -13,8 +13,8 @@@ AC_PREREQ([2.69]
  
  dnl the official version number is
  dnl a.b.c
 -AC_INIT([rrdtool],m4_esyscmd([tr -d '\n' < VERSION]))
 +AC_INIT([rrdtool],[m4_esyscmd(tr -d '\n' < VERSION)])
+ AC_CONFIG_AUX_DIR(conftools)
  
  dnl for testing a numberical version number comes handy
  dnl the released version are