X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=configure.ac;h=e0be4bd47ff6e93b703dc826d3638e670f216bfc;hp=9d9914b506597ac5afb4e651e77b4afa56d4e1bf;hb=89d7243a99966e0d1757ef9adf13a8b206703355;hpb=21bf05343fdc263596289485c3d506ed613f2c75 diff --git a/configure.ac b/configure.ac index 9d9914b..e0be4bd 100644 --- a/configure.ac +++ b/configure.ac @@ -13,14 +13,14 @@ AC_PREREQ(2.59) dnl the official version number is dnl a.b.c -AC_INIT([rrdtool],[1.4.3]) +AC_INIT([rrdtool],[1.4.999]) 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.4003 +NUMVERS=1.4999 AC_SUBST(NUMVERS) dnl for the linker to understand which versions the library are compatible with @@ -110,7 +110,7 @@ AC_ARG_ENABLE(libwrap, LIBS="$LIBS -lwrap" AC_MSG_CHECKING(for libwrap) AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include "tcpd.h"]], [[hosts_access(NULL)]]) + [AC_LANG_PROGRAM([[#include ]], [[hosts_access(NULL)]]) ],[AC_DEFINE(HAVE_LIBWRAP,[1],[have got libwrap installed]) AC_MSG_RESULT([yes]) have_libwrap=yes @@ -124,6 +124,13 @@ AM_CONDITIONAL(BUILD_LIBWRAP,[test $have_libwrap != no]) AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no]) +AC_ARG_ENABLE(rrd_graph,AS_HELP_STRING([--disable-rrd_graph],[disable all rrd_graph functions]), +[enable_rrdcgi=no],[enable_rrd_graph=yes]) + +if test $enable_rrd_graph != no; then + AC_DEFINE([HAVE_RRD_GRAPH], [], [is rrd_graph supported by this install]) +fi + dnl Check if we run on a system that has fonts AC_ARG_WITH(rrd-default-font, [ --with-rrd-default-font=[OPTIONS] set the full path to your default font.], @@ -296,7 +303,7 @@ AC_CHECK_FUNCS(posix_fadvise) CONFIGURE_PART(Libintl Processing) -AM_GNU_GETTEXT_VERSION(0.18) +AM_GNU_GETTEXT_VERSION(0.17) AM_GNU_GETTEXT(external) CONFIGURE_PART(IEEE Math Checks) @@ -492,27 +499,16 @@ dnl is time_t 32 of 64 bit ? AC_DEFINE([TIME_T_IS_32BIT], [], [time_t is 32bit]) AC_DEFINE([TIME_T_IS_64BIT], [], [time_t is 64bit]) AC_MSG_CHECKING([the type of time_t]) -AC_RUN_IFELSE( - AC_LANG_PROGRAM( - [[#include ]], - [[if (sizeof(time_t) != 4) return 1; ]] - ), - [ AC_MSG_RESULT([time_t is 32 bit]) - AC_DEFINE([TIME_T_IS_32BIT]) - ], - [ AC_RUN_IFELSE( - AC_LANG_PROGRAM( - [[#include ]], - [[if (sizeof(time_t) != 8) return 1; ]] - ), - [ - AC_MSG_RESULT([time_t is 64 bit]) - AC_DEFINE([TIME_T_IS_64BIT]) - ], - [AC_MSG_ERROR([can not figure type of time_t])] - ) - ] -) +AC_CHECK_SIZEOF([time_t]) +if test "x$ac_cv_sizeof_time_t" = "x4"; then + AC_MSG_RESULT([time_t is 32 bit]) + AC_DEFINE([TIME_T_IS_32BIT]) +elif test "x$ac_cv_sizeof_time_t" = "x8"; then + AC_MSG_RESULT([time_t is 64 bit]) + AC_DEFINE([TIME_T_IS_64BIT]) +else + AC_MSG_ERROR([can not figure type of time_t]) +fi AC_LANG_POP(C) @@ -538,20 +534,25 @@ AC_ARG_ENABLE(libdbi,AS_HELP_STRING([--disable-libdbi],[do not build in support AM_CONDITIONAL(BUILD_LIBDBI,[test $have_libdbi != no]) +AM_CONDITIONAL(BUILD_RRDGRAPH,[test $enable_rrd_graph != no]) + CORE_LIBS="$LIBS" -dnl EX_CHECK_ALL(z, zlibVersion, zlib.h, zlib, 1.2.3, http://www.gzip.org/zlib/, "") -dnl EX_CHECK_ALL(png, png_access_version_number, png.h, libpng, 1.2.10, http://prdownloads.sourceforge.net/libpng/, "") -dnl EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.1.10, http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2) -dnl EX_CHECK_ALL(fontconfig, FcInit, fontconfig.h, fontconfig, 2.3.1, http://fontconfig.org/release/, /usr/include) -EX_CHECK_ALL(cairo, cairo_font_options_create, cairo.h, cairo-png, 1.4.6, http://cairographics.org/releases/, "") -EX_CHECK_ALL(cairo, cairo_svg_surface_create, cairo-svg.h, cairo-svg, 1.4.6, http://cairographics.org/releases/, "") -EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h, cairo-pdf, 1.4.6, http://cairographics.org/releases/, "") -EX_CHECK_ALL(cairo, cairo_ps_surface_create, cairo-ps.h, cairo-ps, 1.4.6, http://cairographics.org/releases/, "") -EX_CHECK_ALL(glib-2.0, glib_check_version, glib.h, glib-2.0, 2.12.12, ftp://ftp.gtk.org/pub/glib/2.12/, "") -EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango.h, pangocairo, 1.17, http://ftp.gnome.org/pub/GNOME/sources/pango/1.17, "") -EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.6.31, http://xmlsoft.org/downloads.html, /usr/include/libxml2) +if test $enable_rrd_graph != no; then +dnl EX_CHECK_ALL(z, zlibVersion, zlib.h, zlib, 1.2.5, http://zlib.net/, "") +dnl EX_CHECK_ALL(png, png_access_version_number, png.h, libpng, 1.4.8, ftp://ftp.simplesystems.org/pub/libpng/png/src/, "") +dnl EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.4.6, http://download.savannah.gnu.org/releases/freetype/, /usr/include/freetype2) +dnl EX_CHECK_ALL(fontconfig, FcInit, fontconfig.h, fontconfig, 2.8.0, http://www.freedesktop.org/software/fontconfig/release/, /usr/include) +EX_CHECK_ALL(cairo, cairo_font_options_create, cairo.h, cairo-png, 1.10.2, http://cairographics.org/releases/, "") +EX_CHECK_ALL(cairo, cairo_svg_surface_create, cairo-svg.h, cairo-svg, 1.10.2, http://cairographics.org/releases/, "") +EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h, cairo-pdf, 1.10.2, http://cairographics.org/releases/, "") +EX_CHECK_ALL(cairo, cairo_ps_surface_create, cairo-ps.h, cairo-ps, 1.10.2, http://cairographics.org/releases/, "") +EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "") + +fi +EX_CHECK_ALL(glib-2.0, glib_check_version, glib.h, glib-2.0, 2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "") +EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html, /usr/include/libxml2) if test "$EX_CHECK_ALL_ERR" = "YES"; then AC_MSG_ERROR([Please fix the library issues listed above and try again.]) @@ -864,7 +865,7 @@ if test "$enable_tcl" = "yes"; then TCL_INCLUDE_SPEC="$TCL_INCLUDE_SPEC -I$TCL_INC_DIR" fi fi - AC_ARG_ENABLE(tcl,AS_HELP_STRING([--enable-tcl-site],[install the tcl extension in the tcl tree]), + AC_ARG_ENABLE(tcl-site,AS_HELP_STRING([--enable-tcl-site],[install the tcl extension in the tcl tree]), [],[enable_tcl_site=yes]) fi @@ -902,8 +903,16 @@ fi AC_SUBST(COMP_PYTHON) dnl Check for nroff -AC_PATH_PROGS(NROFF, gnroff nroff) -AC_PATH_PROGS(TROFF, groff troff) +AC_ARG_VAR(NROFF, [path to the local nroff version]) +AC_PATH_PROGS(NROFF, [gnroff nroff]) +if test x$NROFF = x; then + AC_MSG_ERROR([I need a copy of *nroff to format the documentation]) +fi +AC_ARG_VAR(TROFF, [path to the local troff version]) +AC_PATH_PROGS(TROFF, [groff troff]) +if test x$TROFF = x; then + AC_MSG_ERROR([I need a copy of *troff to format the documentation]) +fi AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] Documentation directory]) if test -z "$RRDDOCDIR"; then @@ -959,6 +968,7 @@ echo "Config is DONE!" echo echo " With MMAP IO: $enable_mmap" echo " Build rrd_getopt: $build_getopt" +echo " Build rrd_graph: $enable_rrd_graph" echo " Static programs: $staticprogs" echo " Perl Modules: $COMP_PERL" echo " Perl Binary: $PERL"