sync up with Dag Wieers version from http://dag.wieers.com/packages/rrdtool/rrdtool...

[rrdtool.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c98bf69..0dae62f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,13 +8,13 @@ dnl Inspiration from http://autoconf-archive.cryp.to
 dnl tell automake the this script is for rrdtool
 dnl the official version number is
 dnl a.b.c
 dnl tell automake the this script is for rrdtool
 dnl the official version number is
 dnl a.b.c

-AC_INIT([rrdtool],[1.2.8])
+AC_INIT([rrdtool],[1.2.9])

 dnl for testing a numberical version number comes handy
 dnl the released version are
 dnl a.bccc
 dnl the devl versions will be something like
 dnl a.b999yymmddhh 
 dnl for testing a numberical version number comes handy
 dnl the released version are
 dnl a.bccc
 dnl the devl versions will be something like
 dnl a.b999yymmddhh 

-NUMVERS=1.2008
+NUMVERS=1.2009

 AC_SUBST(NUMVERS)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_SUBST(NUMVERS)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE


@@ -175,10 +175,6 @@ AC_STRUCT_TM
 
 dnl Checks for libraries.
 AC_CHECK_FUNC(acos, , AC_CHECK_LIB(m, acos))
 
 dnl Checks for libraries.
 AC_CHECK_FUNC(acos, , AC_CHECK_LIB(m, acos))

-dnl Use libiconv if we have one but fall back to libc otherwhise
-AC_CHECK_LIB(iconv, iconv_open, , [
-         AC_CHECK_FUNC(iconv_open,,)
-         ])

 
 dnl add pic flag in any case this makes sure all our code is relocatable
 eval `./libtool --config | grep pic_flag`
 
 dnl add pic flag in any case this makes sure all our code is relocatable
 eval `./libtool --config | grep pic_flag`