X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=003e0ce7c8308fff91e2114fe156ddf67630e505;hb=eb7c95171c437a16d055021b8f4fdb98f017f24f;hp=618acc613b718b5aaf13ffc6fddf0cd4de06558e;hpb=3882bb0c2d15f97298aaa7602d6353a1888f5547;p=rrdtool.git

diff --git a/configure.ac b/configure.ac
index 618acc6..003e0ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,4 @@
+
 dnl RRDtool AutoConf script ... 
 dnl ---------------------------
 dnl
@@ -8,13 +9,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.16])
+AC_INIT([rrdtool],[1.2.19])
 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.2016
+NUMVERS=1.2019
 AC_SUBST(NUMVERS)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -426,7 +427,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 +497,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 +589,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)
@@ -609,7 +621,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]],[[]])