update build instructions and configure output.

[rrdtool.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 39a7063..72c3a80 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])
@@ -422,14 +434,21 @@ echo
 echo "----------------------------------------------------------------"
 echo "Config is DONE!"
 echo
+echo "    With MMAP IO: $ac_cv_func_mmap_fixed_mapped"
+echo "    Perl Modules: $COMP_PERL"
+echo "     Perl Binary: $PERL"
+echo "    Perl Version: $PERL_VERSION"
+echo "    Perl Options: $PERL_MAKE_OPTIONS"
+echo "      Tcl Config: $tcl_config"
+echo "    Build rrdcgi: $enable_rrdcgi"
+echo " Build librrd MT: $enable_pthread"
+echo
+ech
 echo "Type 'make' to compile the software and use 'make install' to "
 echo "install everything to: $prefix."
-echo
-echo "If you want to install the perl"
-echo "modules in site-perl, try 'make site-perl-install'."
 echo 
 echo "       ... that wishlist is NO JOKE. If you find RRDtool useful"
-echo "make me happy. Go to http://people.ee.ethz.ch/~oetiker/wish and"
+echo "make me happy. Go to http://people.ee.ethz.ch/oetiker/wish and"
 echo "place an order."
 echo 
 echo "                               -- Tobi Oetiker <tobi@oetiker.ch>"