X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=program%2Fconfigure.ac;h=fd6f52e740d54bd93a0c7a75bb93ec972453fb07;hb=069568a8ec27ee8d5e181e8db2dda8a426cda4c1;hp=9c4b3812cc3f8ede9570d4514d463bf8beaa3c54;hpb=3d822323f95c99a8fe07786ff44abd97f84ea8dd;p=rrdtool-all.git

diff --git a/program/configure.ac b/program/configure.ac
index 9c4b3812..fd6f52e7 100644
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -166,6 +166,10 @@ AC_STRUCT_TM
 
 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`
@@ -385,6 +389,10 @@ AC_SUBST(TCL_SHLIB_SUFFIX)
 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
@@ -431,6 +439,7 @@ AC_CONFIG_FILES([examples/shared-demo.pl			\
           src/Makefile					\
           bindings/Makefile                             \
           bindings/tcl/Makefile				\
+          bindings/python/Makefile			\
           Makefile])
 AC_CONFIG_COMMANDS([default],[[\
           chmod +x examples/*.cgi examples/*.pl]],[[]])
@@ -460,6 +469,7 @@ echo "     Perl Binary: $PERL"
 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