From: Maksym Sobolyev <sobomax@sippysoft.com>
Date: Wed, 28 Jan 2015 18:38:54 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.5.0-rc2~14^2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b3face4f252cfb91f9e2fba1038ac880ee07e32;p=thirdparty%2Frrdtool-1.x.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	configure.ac
---

6b3face4f252cfb91f9e2fba1038ac880ee07e32
diff --cc configure.ac
index e9f9784e,7477fa7c..9343df26
--- a/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