X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=fca2c34c6167a61e7c54ba9b3aae29d7955a8951;hb=0043267aa80eec6dbb4e406b52585c974f176a2f;hp=de4cb5ec91aeb33da2f9ce852d2095f3c1a31f8c;hpb=d3f1c3f15c375a72bb4fe4694cc651e40d8803a1;p=rrdtool.git

diff --git a/configure.ac b/configure.ac
index de4cb5e..fca2c34 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.11])
+AC_INIT([rrdtool],[1.2.12])
 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.2011
+NUMVERS=1.2012
 AC_SUBST(NUMVERS)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -26,7 +26,6 @@ dnl is in there
 
 dnl determine the type of system we are running on
 
-
 AC_SUBST(VERSION)
 
 AC_PREFIX_DEFAULT( /usr/local/rrdtool-$PACKAGE_VERSION )
@@ -231,7 +230,7 @@ if test "x$enable_mmap" = xyes; then
     *cygwin*)
        # the normal mmap test does not work in cygwin
        AC_CHECK_FUNCS(mmap)
-       if [ ${ac_cv_func_mmap} = yes ]; then
+       if [ "x${ac_cv_func_mmap}" = xyes ]; then
          ac_cv_func_mmap_fixed_mapped=yes
        fi
     ;;
@@ -463,6 +462,8 @@ AC_SUBST(PERL)
 AC_SUBST(COMP_PERL)
 AC_SUBST(PERL_VERSION)
 
+enable_tcl_site=no
+
 AC_ARG_ENABLE(tcl,[  --disable-tcl           do not build the tcl modules],
 [],[enable_tcl=yes])
 
@@ -489,9 +490,13 @@ if test  "$enable_tcl" = "yes"; then
 	. $tcl_config
 	TCL_PACKAGE_DIR="$TCL_PACKAGE_PATH/tclrrd$VERSION"
   fi
+  AC_ARG_ENABLE(tcl,[  --enable-tcl-site        install the tcl extension in the tcl tree],
+  [],[enable_tcl_site=yes])
+
 fi
 
 AM_CONDITIONAL(BUILD_TCL, test "$enable_tcl" = "yes" )
+AM_CONDITIONAL(BUILD_TCL_SITE, test "$enable_tcl_site" = "yes" )
 
 AC_SUBST(TCL_PREFIX)
 AC_SUBST(TCL_SHLIB_CFLAGS)
@@ -538,21 +543,21 @@ fi
 
 CONFIGURE_PART(Apply Configuration Information)
  
-AC_CONFIG_FILES([examples/shared-demo.pl			
-          examples/piped-demo.pl			
-          examples/stripes.pl				
-          examples/bigtops.pl				
-          examples/minmax.pl				
-          examples/cgi-demo.cgi				
-          examples/4charts.pl  				
-          examples/Makefile				
-          doc/Makefile					
-          src/Makefile					
-          bindings/Makefile                             
-          bindings/tcl/Makefile				
-          bindings/tcl/ifOctets.tcl			
-          bindings/python/Makefile
-          Makefile])
+AC_CONFIG_FILES([examples/shared-demo.pl])
+AC_CONFIG_FILES([examples/piped-demo.pl])
+AC_CONFIG_FILES([examples/stripes.pl])
+AC_CONFIG_FILES([examples/bigtops.pl])
+AC_CONFIG_FILES([examples/minmax.pl])
+AC_CONFIG_FILES([examples/cgi-demo.cgi])
+AC_CONFIG_FILES([examples/4charts.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/*.cgi examples/*.pl]],[[]])
 AC_OUTPUT
@@ -560,7 +565,7 @@ AC_OUTPUT
 AC_MSG_CHECKING(in)
 AC_MSG_RESULT(and out again)
 
-echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/~oetiker/wish $ECHO_C" 1>&6
+echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/oetiker/wish $ECHO_C" 1>&6
 sleep 1
 echo $ECHO_N ".$ECHO_C" 1>&6
 sleep 1