X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=65256caaa8943662dd277b354cce58fa00017915;hb=0ac127971ec7a649efbf7e40d7acd28f90b18b8f;hp=48c03c649540b75778bc209631647117db3147a7;hpb=da2023956e265b7fcaede0dc91e10a7a248e4c87;p=rrdtool.git diff --git a/configure.ac b/configure.ac index 48c03c6..65256ca 100644 --- a/configure.ac +++ b/configure.ac @@ -6,16 +6,31 @@ dnl 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.99908020600]) +AC_INIT([rrdtool],[1.3rc1]) + dnl for testing a numberical version number comes handy dnl the released version are dnl a.bccc dnl the devel versions will be something like dnl a.b999yymmddhh -NUMVERS=1.299908020600 +NUMVERS=1.299908051200 AC_SUBST(NUMVERS) + +dnl for the linker to understand which version the library is compatible with +dnl we must keep a separate library version cout of the format c:r:a if any +dnl functionality is changed do c++ prior to release +dnl if only implementation changed but all interfaces are kept, do r++ +dnl when only functionality was added, do a++ if any functionality was +dnl removed to a=0. +dnl +dnl see http://sourceware.org/autobook/autobook/autobook_91.html +dnl +LIBVERS=3:0:1 +AC_SUBST(LIBVERS) + AC_CANONICAL_TARGET AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([rrd_config.h]) @@ -68,6 +83,11 @@ AH_BOTTOM([ # include #endif +/* FreeBSD 4.8 wants this included BEFORE sys/types.h */ +#ifdef HAVE_SYS_MMAN_H +# include +#endif + #ifdef HAVE_SYS_TYPES_H # include #endif @@ -91,10 +111,6 @@ AH_BOTTOM([ # include #endif -#ifdef HAVE_SYS_MMAN_H -# include -#endif - #if !defined HAVE_MADVISE && defined HAVE_POSIX_MADVISE /* use posix_madvise family */ # define madvise posix_madvise @@ -138,7 +154,7 @@ AH_BOTTOM([ #ifdef HAVE_SYS_RESOURCE_H # include #if (defined(__svr4__) && defined(__sun__)) -/* Solaris headers (pre 2.6) don't have a getrusage prototype. +/* Solaris headers (pre 2.6) do not have a getrusage prototype. Use this instead. */ extern int getrusage(int, struct rusage *); #endif /* __svr4__ && __sun__ */ @@ -780,7 +796,7 @@ if test "$enable_tcl" = "yes"; then done if test "$enable_tcl" = "no"; then - AC_MSG_WARN([tclConfig.sh not found - Tcl interface won't be built]) + AC_MSG_WARN([tclConfig.sh not found - Tcl interface will not be built]) else . $tcl_config TCL_PACKAGE_DIR="$TCL_PACKAGE_PATH/tclrrd$VERSION"