X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=516707e345835628476a9155762102d24afd08ce;hb=963ea81c470181470ba8f3260c43d171fc403902;hp=f385ebc54997a9a1cc391ea85499cf16869e48cc;hpb=c2588300e3b61df51b846dd79d90b3da9628d0cb;p=rrdtool.git

diff --git a/configure.ac b/configure.ac
index f385ebc..516707e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl determine the type of system we are running on
 AC_SUBST(VERSION)
 
 dnl where we install our stuff ...
-AC_PREFIX_DEFAULT( /usr/local/rrdtool-1.1.0 )
+AC_PREFIX_DEFAULT( /usr/local/rrdtool-$PACKAGE_VERSION )
 
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)
@@ -41,6 +41,7 @@ AH_TOP([
 
 /* realloc does not support NULL as argument */
 #undef NO_NULL_REALLOC
+
  ])
 
 AH_BOTTOM([
@@ -169,6 +170,16 @@ dnl of the form HAVE_FUNCTION
 
 AC_CHECK_FUNCS(tzset opendir readdir chdir chroot getuid setlocale strerror strerror_r snprintf vsnprintf fpclass class fp_class isnan memmove strchr mktime getrusage gettimeofday)
 
+dnl Use mmap in rrd_update instead of seek+write
+AC_ARG_ENABLE([mmap],
+[  --disable-mmap          disable mmap in rrd_update, use seek+write instead],
+[],
+[enable_mmap=yes])
+
+if test "x$enable_mmap" = xyes; then
+  AC_FUNC_MMAP
+fi
+
 dnl HP-UX 11.00 does not have finite but does have isfinite as a macro so we need
 dnl actual code to check if this works
 AC_CHECK_FUNCS(fpclassify, ,
@@ -250,12 +261,6 @@ AC_SUBST(MULTITHREAD_LDFLAGS)
 AC_ARG_ENABLE(pthread,[  --disable-pthread       disable multithread support],
 [],[enable_pthread=yes])
 
-dnl since we use lots of *_r functions all over the code we better
-dnl make sure they are known
-
-if test  "x$x_rflag" != "xno"; then
-   CPPFLAGS="$CPPFLAGS $x_rflag"
-fi
 
 if test $enable_pthread != no; then 
  ACX_PTHREAD([
@@ -265,6 +270,12 @@ if test $enable_pthread != no; then
 	     [])
 fi
 
+dnl since we use lots of *_r functions all over the code we better
+dnl make sure they are known
+
+if test  "x$x_rflag" != "xno"; then
+   CPPFLAGS="$CPPFLAGS $x_rflag"
+fi
 
  
 AM_CONDITIONAL(BUILD_MULTITHREAD,[test $enable_pthread != no])
@@ -323,6 +334,7 @@ AC_SUBST(PERL)
 AC_SUBST(COMP_PERL)
 AC_SUBST(PERL_VERSION)
 
+
 dnl Check for Tcl.
 withval=""
 AC_ARG_WITH(tcllib,[  --with-tcllib=DIR       location of the tclConfig.sh])