diff --git a/program/configure.ac b/program/configure.ac
index de4cb5ec91aeb33da2f9ce852d2095f3c1a31f8c..eb3e53170ee36f38467608e15eefc3c075872a4b 100644 (file)
--- a/program/configure.ac
+++ b/program/configure.ac
dnl tell automake the this script is for rrdtool
dnl the official version number is
dnl a.b.c
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
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
AC_SUBST(NUMVERS)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
*cygwin*)
# the normal mmap test does not work in cygwin
AC_CHECK_FUNCS(mmap)
*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
;;
ac_cv_func_mmap_fixed_mapped=yes
fi
;;
AC_SUBST(COMP_PERL)
AC_SUBST(PERL_VERSION)
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])
AC_ARG_ENABLE(tcl,[ --disable-tcl do not build the tcl modules],
[],[enable_tcl=yes])
. $tcl_config
TCL_PACKAGE_DIR="$TCL_PACKAGE_PATH/tclrrd$VERSION"
fi
. $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" )
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)
AC_SUBST(TCL_PREFIX)
AC_SUBST(TCL_SHLIB_CFLAGS)
CONFIGURE_PART(Apply Configuration Information)
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
AC_CONFIG_COMMANDS([default],[[ chmod +x examples/*.cgi examples/*.pl]],[[]])
AC_OUTPUT