diff --git a/program/configure.ac b/program/configure.ac
index 95562ae2374a5fee93ff09e10f78e9b0b4a9e4eb..fd6f52e740d54bd93a0c7a75bb93ec972453fb07 100644 (file)
--- a/program/configure.ac
+++ b/program/configure.ac
dnl Inspiration from http://autoconf-archive.cryp.to
dnl tell automake the this script is for rrdtool
dnl Inspiration from http://autoconf-archive.cryp.to
dnl tell automake the this script is for rrdtool
-AC_INIT([rrdtool],[1.2rc6])
+AC_INIT([rrdtool],[1.2.6])
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
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`
EX_CHECK_ALL(cgi, cgiInit, cgi.h, cgilib, 0.5, http://www.infodrom.org/projects/cgilib, "")
fi
EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point, libart_lgpl/libart.h, libart-2.0, 2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, /usr/include/libart-2.0)
EX_CHECK_ALL(cgi, cgiInit, cgi.h, cgilib, 0.5, http://www.infodrom.org/projects/cgilib, "")
fi
EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point, libart_lgpl/libart.h, libart-2.0, 2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, /usr/include/libart-2.0)
-EX_CHECK_ALL(z, zlibVersion, zlib.h, zlib, 1.2.1, http://www.gzip.org/zlib/, "")
+EX_CHECK_ALL(z, zlibVersion, zlib.h, zlib, 1.2.2, http://www.gzip.org/zlib/, "")
EX_CHECK_ALL(png, png_access_version_number, png.h, libpng, 1.2.8, http://prdownloads.sourceforge.net/libpng/, "")
EX_CHECK_ALL(png, png_access_version_number, png.h, libpng, 1.2.8, http://prdownloads.sourceforge.net/libpng/, "")
-EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.1.9, http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2)
+EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.1.9, http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2)
if test "$EX_CHECK_ALL_ERR" = "YES"; then
AC_MSG_ERROR([Please fix the library issues listed above and try again.])
if test "$EX_CHECK_ALL_ERR" = "YES"; then
AC_MSG_ERROR([Please fix the library issues listed above and try again.])
AC_MSG_RESULT($perlcc)
if test ! -x $perlcc; then
AC_PATH_PROG(PERLCC, ${perlcc}, no)
AC_MSG_RESULT($perlcc)
if test ! -x $perlcc; then
AC_PATH_PROG(PERLCC, ${perlcc}, no)
- if test -x $"x$PERLCC" = "xno"; then
+ if test -x "x$PERLCC" = "xno"; then
AC_MSG_WARN([
I would not find the Compiler ($perlcc) that was originally used to compile your
perl binary. You should either make sure that this compiler is available on your
AC_MSG_WARN([
I would not find the Compiler ($perlcc) that was originally used to compile your
perl binary. You should either make sure that this compiler is available on your
AC_SUBST(TCL_PACKAGE_PATH)
AC_SUBST(TCL_LD_SEARCH_FLAGS)
AC_SUBST(TCL_PACKAGE_PATH)
AC_SUBST(TCL_LD_SEARCH_FLAGS)
+dnl Check for python
+AM_PATH_PYTHON(2.3)
+AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+
dnl Check for nroff
dnl Check for nroff
src/Makefile \
bindings/Makefile \
bindings/tcl/Makefile \
src/Makefile \
bindings/Makefile \
bindings/tcl/Makefile \
+ bindings/python/Makefile \
Makefile])
AC_CONFIG_COMMANDS([default],[[\
chmod +x examples/*.cgi examples/*.pl]],[[]])
Makefile])
AC_CONFIG_COMMANDS([default],[[\
chmod +x examples/*.cgi examples/*.pl]],[[]])
echo " Perl Version: $PERL_VERSION"
echo " Perl Options: $PERL_MAKE_OPTIONS"
echo " Tcl Config: $tcl_config"
echo " Perl Version: $PERL_VERSION"
echo " Perl Options: $PERL_MAKE_OPTIONS"
echo " Tcl Config: $tcl_config"
+echo " Python Version: $PYTHON_VERSION"
echo " Build rrdcgi: $enable_rrdcgi"
echo " Build librrd MT: $enable_pthread"
echo
echo " Build rrdcgi: $enable_rrdcgi"
echo " Build librrd MT: $enable_pthread"
echo