get ready for 1.2

[rrdtool.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f385ebc..370dd5c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl
 dnl Inspiration from http://autoconf-archive.cryp.to
 
 dnl tell automake the this script is for rrdtool
-AC_INIT([rrdtool],[1.1.9901])
+AC_INIT([rrdtool],[1.2rc1])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
@@ -21,7 +21,11 @@ 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 )
+if [ -d /opt ]; then
+   AC_PREFIX_DEFAULT( /opt/rrdtool-$PACKAGE_VERSION )
+else
+   AC_PREFIX_DEFAULT( /usr/local/rrdtool-$PACKAGE_VERSION )
+fi
 
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)
@@ -41,6 +45,7 @@ AH_TOP([
 
 /* realloc does not support NULL as argument */
 #undef NO_NULL_REALLOC
+
  ])
 
 AH_BOTTOM([
@@ -169,6 +174,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, ,
@@ -197,14 +212,14 @@ AC_DEFINE_UNQUOTED(RRDGRAPH_YLEGEND_ANGLE,${RRDGRAPH_YLEGEND_ANGLE:-90.0},
 AC_ARG_ENABLE(rrdcgi,[  --disable-rrdcgi        disable building of rrdcgi],
 [],[enable_rrdcgi=yes])
 AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])
- 
+
 if test $enable_rrdcgi != no; then
-EX_CHECK_ALL(cgi,        cgiInit,                   cgi.h,                  cgilib,      0.5,    http://www.infodrom.org/projects/cgilib)
+EX_CHECK_ALL(cgi,        cgiInit,                   cgi.h,                  cgilib,      0.5,    http://www.infodrom.org/projects/cgilib, "")
 fi
-EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point,       libart_lgpl/libart.h,   libart-2.0,  2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/)
-EX_CHECK_ALL(z,          zlibVersion,               zlib.h,                 zlib,        1.2.1,  http://www.gzip.org/zlib/)
-EX_CHECK_ALL(png,        png_access_version_number, png.h,                  libpng,      1.2.8,  http://prdownloads.sourceforge.net/libpng/)
-EX_CHECK_ALL(freetype,   FT_Init_FreeType,          ft2build.h,                     freetype2,   2.1.9,  http://prdownloads.sourceforge.net/freetype/)
+EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point,       libart_lgpl/libart.h,   libart-2.0,  2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, /usr/include/libart-2.0)
+EX_CHECK_ALL(z,          zlibVersion,               zlib.h,                 zlib,        1.2.1,  http://www.gzip.org/zlib/, "")
+EX_CHECK_ALL(png,        png_access_version_number, png.h,                  libpng,      1.2.8,  http://prdownloads.sourceforge.net/libpng/, "")
+EX_CHECK_ALL(freetype,   FT_Init_FreeType,          ft2build.h,                     freetype2,   2.1.9,  http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2)
 
 if test "$EX_CHECK_ALL_ERR" = "YES"; then
   AC_MSG_ERROR([Please fix the library issues listed above and try again.])
@@ -250,12 +265,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 +274,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 +338,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 +438,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>"