prepare for the release of rrdtool-1.2.23

[rrdtool.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a39cd8d..4061795 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
-AC_INIT([rrdtool],[1.2.15])
+AC_INIT([rrdtool],[1.2.23])
 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.2015
+NUMVERS=1.2023
 AC_SUBST(NUMVERS)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -426,7 +426,7 @@ else
            perlcc=`$PERL -MConfig -e 'print $Config{cc}'`
            AC_MSG_RESULT($perlcc)
            if test ! -x "$perlcc"; then
-               AC_PATH_PROG(PERL_CC, "${perlcc}", no)
+               AC_PATH_PROG(PERL_CC, ${perlcc}, no)
                if test "$PERL_CC" = "no"; then
                     AC_MSG_WARN([
 I would not find the Compiler ($perlcc) that was originally used to compile
@@ -496,16 +496,21 @@ AC_PATH_PROG(RUBY, ruby, no)
 AC_ARG_ENABLE(ruby,[  --disable-ruby          do not build the ruby modules],
 [],[enable_ruby=yes])
 
+AC_MSG_CHECKING(if ruby modules can be built)
 
 if test "x$RUBY" = "xno" -o  x$enable_ruby = xno; then
        COMP_RUBY=
+       AC_MSG_RESULT(No .. Ruby not found or disabled)
 else
-       COMP_RUBY="ruby"
-
+       if $RUBY -e 'require "mkmf"' >/dev/null 2>&1; then
+               COMP_RUBY="ruby"
+               AC_MSG_RESULT(YES)
+       else
+               COMP_RUBY=
+               AC_MSG_RESULT(Ruby found but mkmf is missing! Install the -dev package)         
+       fi                              
 fi
 
-AC_MSG_CHECKING(Ruby Modules to build)
-AC_MSG_RESULT(${COMP_RUBY:-No Ruby Modules will be built})
 
 dnl pass additional ruby options when generating Makefile from Makefile.PL
 AC_ARG_ENABLE(ruby-site-install,
@@ -583,7 +588,13 @@ AM_PATH_PYTHON(2.3,[],[enable_python=no])
 AM_CHECK_PYTHON_HEADERS(,[enable_python=no;AC_MSG_WARN(could not find Python headers)])
 fi
 
-AM_CONDITIONAL(BUILD_PYTHON,[test "$enable_python" = "yes"])
+if test  x$enable_python = xno; then
+       COMP_PYTHON=
+else
+       COMP_PYTHON="python"
+fi
+
+AC_SUBST(COMP_PYTHON)
 
 dnl Check for nroff
 AC_PATH_PROGS(NROFF, gnroff nroff)
@@ -602,13 +613,13 @@ AC_CONFIG_FILES([examples/stripes.pl])
 AC_CONFIG_FILES([examples/bigtops.pl])
 AC_CONFIG_FILES([examples/minmax.pl])
 AC_CONFIG_FILES([examples/4charts.pl])
+AC_CONFIG_FILES([examples/perftest.pl])
 AC_CONFIG_FILES([examples/Makefile])
 AC_CONFIG_FILES([doc/Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([bindings/Makefile])
 AC_CONFIG_FILES([bindings/tcl/Makefile])
 AC_CONFIG_FILES([bindings/tcl/ifOctets.tcl])
-AC_CONFIG_FILES([bindings/python/Makefile])
 AC_CONFIG_FILES([Makefile])          
 
 AC_CONFIG_COMMANDS([default],[[ chmod +x examples/*.pl]],[[]])