X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=4061795badf2e6595df1a3949f7e9acfe3bf2760;hb=4af79d1fe0fbb9655cf28a0989d2e98b94b37460;hp=19fae7be76e2a5e40351ee7e5d24ce51afe795a8;hpb=16af423f0593e795731c4ab6917bf9a3e0e76e90;p=rrdtool.git

diff --git a/configure.ac b/configure.ac
index 19fae7b..4061795 100644
--- 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.19])
+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.2019
+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,18 +496,22 @@ 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,
 [  --enable-ruby-site-install   by default the rrdtool ruby modules are installed
@@ -616,7 +620,6 @@ 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]],[[]])