we are going to use indent from now on to keep code indenting consistent throughout...

[rrdtool.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c36a736..09e0260 100644 (file)
--- 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
 dnl tell automake the this script is for rrdtool
 dnl the official version number is
 dnl a.b.c

-AC_INIT([rrdtool],[1.2.20])
+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 
 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.2020
+NUMVERS=1.2023

 AC_SUBST(NUMVERS)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_SUBST(NUMVERS)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE


@@ -52,11 +52,16 @@ AH_TOP([
  ])
 
 AH_BOTTOM([
  ])
 
 AH_BOTTOM([

+/* enable posix_fadvise on linux */
+#if defined(HAVE_POSIX_FADVISE) && defined(HAVE_FCNTL_H)
+#define _XOPEN_SOURCE 600
+#include <fcntl.h>
+#endif

 
 /* define strrchr, strchr and memcpy, memmove in terms of bsd funcs
    make sure you are NOT using bcopy, index or rindex in the code */
       
 
 /* define strrchr, strchr and memcpy, memmove in terms of bsd funcs
    make sure you are NOT using bcopy, index or rindex in the code */
       

-#if STDC_HEADERS
+#ifdef STDC_HEADERS

 # include <string.h>
 #else
 # ifndef HAVE_STRCHR
 # include <string.h>
 #else
 # ifndef HAVE_STRCHR


@@ -70,30 +75,29 @@ char *strchr (), *strrchr ();
 # endif
 #endif
 
 # endif
 #endif
 

-
-#if NO_NULL_REALLOC
+#ifdef NO_NULL_REALLOC

 # define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))
 #else
 # define rrd_realloc(a,b) realloc((a), (b))
 # define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))
 #else
 # define rrd_realloc(a,b) realloc((a), (b))

-#endif      
+#endif

 
 

-#if NEED_MALLOC_MALLOC_H
+#ifdef NEED_MALLOC_MALLOC_H

 #  include <malloc/malloc.h>
 #endif
 
 #  include <malloc/malloc.h>
 #endif
 

-#if HAVE_MATH_H
+#ifdef HAVE_MATH_H

 #  include <math.h>
 #endif
 
 #  include <math.h>
 #endif
 

-#if HAVE_FLOAT_H
+#ifdef HAVE_FLOAT_H

 #  include <float.h>
 #endif
 
 #  include <float.h>
 #endif
 

-#if HAVE_IEEEFP_H
+#ifdef HAVE_IEEEFP_H

 #  include <ieeefp.h>
 #endif
 
 #  include <ieeefp.h>
 #endif
 

-#if HAVE_FP_CLASS_H
+#ifdef HAVE_FP_CLASS_H

 #  include <fp_class.h>
 #endif
 
 #  include <fp_class.h>
 #endif
 


@@ -218,7 +222,7 @@ CONFIGURE_PART(Checking for Header Files)
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT

-AC_CHECK_HEADERS(sys/stat.h sys/types.h fcntl.h time.h locale.h fp_class.h malloc.h unistd.h ieeefp.h math.h sys/time.h sys/times.h sys/param.h sys/resource.h float.h)
+AC_CHECK_HEADERS(sys/stat.h sys/types.h fcntl.h locale.h fp_class.h malloc.h unistd.h ieeefp.h math.h sys/times.h sys/param.h sys/resource.h float.h)

 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST


@@ -243,8 +247,12 @@ AC_C_BIGENDIAN
 dnl for each function found we get a definition in config.h 
 dnl of the form HAVE_FUNCTION
 
 dnl for each function found we get a definition in config.h 
 dnl of the form HAVE_FUNCTION
 

-AC_CHECK_FUNCS(tzset mbstowcs opendir readdir chdir chroot getuid setlocale strerror strerror_r snprintf vsnprintf fpclass class fp_class isnan memmove strchr mktime getrusage gettimeofday)
+AC_CHECK_FUNCS(tzset mbstowcs opendir readdir chdir chroot getuid setlocale strerror strerror_r snprintf vsnprintf fpclass class fp_class isnan memmove strchr mktime getrusage gettimeofday posix_fadvise madvise)

 
 

+AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
+AC_CHECK_DECLS(posix_fadvise, [], [], [#define _XOPEN_SOURCE 600
+#include <fcntl.h>])
+AC_CHECK_DECLS(madvise, [], [], [#include <sys/mman.h>])

 
 if test "x$enable_mmap" = xyes; then
   case "$host" in
 
 if test "x$enable_mmap" = xyes; then
   case "$host" in


@@ -378,7 +386,7 @@ AC_LINK_IFELSE(
 )
 AC_LANG_POP(C)
 
 )
 AC_LANG_POP(C)
 

-CONFIGURE_PART(Findr 3rd-Party Libraries)
+CONFIGURE_PART(Find 3rd-Party Libraries)

 
 
 AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])
 
 
 AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])