projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fox sed line for unsetting header cache
[rrdtool.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
f8ff957
..
fd6f52e
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-6,7
+6,7
@@
dnl
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.2.
1
])
+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])
@@
-166,6
+166,10
@@
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`
@@
-311,7
+315,7
@@
else
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
@@
-385,6
+389,10
@@
AC_SUBST(TCL_SHLIB_SUFFIX)
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
@@
-431,6
+439,7
@@
AC_CONFIG_FILES([examples/shared-demo.pl \
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]],[[]])
@@
-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 " 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