X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=configure.ac;h=9d9914b506597ac5afb4e651e77b4afa56d4e1bf;hp=f438a87e6b0d36c137f810c440671883d135999b;hb=21bf05343fdc263596289485c3d506ed613f2c75;hpb=b4fd5d71cb3e4bdb9e12cc22f3d1373123c7e050 diff --git a/configure.ac b/configure.ac index f438a87..9d9914b 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.3.999]) +AC_INIT([rrdtool],[1.4.3]) 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.3999 +NUMVERS=1.4003 AC_SUBST(NUMVERS) dnl for the linker to understand which versions the library are compatible with @@ -31,7 +31,7 @@ dnl - if any functionality was removed do c++,r=0,a=0. dnl dnl see http://sourceware.org/autobook/autobook/autobook_91.html dnl -LIBVERS=5:0:1 +LIBVERS=5:3:1 AC_SUBST(LIBVERS) AC_CANONICAL_TARGET @@ -102,6 +102,28 @@ AC_DEFINE_UNQUOTED(RRDGRAPH_YLEGEND_ANGLE,${RRDGRAPH_YLEGEND_ANGLE:-90.0}, AC_ARG_ENABLE(rrdcgi,AS_HELP_STRING([--disable-rrdcgi],[disable building of rrdcgi]), [],[enable_rrdcgi=yes]) +AC_ARG_ENABLE(libwrap, + AS_HELP_STRING([--disable-libwrap], + [do not build in support for libwrap (tcp wrapper)]), + [have_libwrap=no],[ + XXX=$LIBS + LIBS="$LIBS -lwrap" + AC_MSG_CHECKING(for libwrap) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include "tcpd.h"]], [[hosts_access(NULL)]]) + ],[AC_DEFINE(HAVE_LIBWRAP,[1],[have got libwrap installed]) + AC_MSG_RESULT([yes]) + have_libwrap=yes + ],[LIBS=$XXX + AC_MSG_RESULT([no]) + have_libwrap=no + ] + ) +]) +AM_CONDITIONAL(BUILD_LIBWRAP,[test $have_libwrap != no]) + +AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no]) + 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.], @@ -161,7 +183,7 @@ AC_SUBST(WERROR) dnl which flags does the compiler support? if test "x$GCC" = "xyes"; then - for flag in -fno-strict-aliasing -Wall -std=c99 -pedantic -Wundef -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition -W; do + for flag in -fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition -W; do oCFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" cachename=rd_cv_gcc_flag_`echo $flag|sed 's/[[^A-Za-z]]/_/g'` @@ -182,7 +204,7 @@ CONFIGURE_PART(Checking for Header Files) dnl Checks for header files. AC_HEADER_STDC AC_HEADER_DIRENT -AC_CHECK_HEADERS(stdint.h inttypes.h libgen.h features.h sys/stat.h sys/types.h fcntl.h fp_class.h malloc.h unistd.h ieeefp.h math.h sys/times.h sys/param.h sys/resource.h signal.h float.h stdio.h stdlib.h errno.h string.h ctype.h) +AC_CHECK_HEADERS(langinfo.h stdint.h inttypes.h libgen.h features.h sys/stat.h sys/types.h fcntl.h fp_class.h malloc.h unistd.h ieeefp.h math.h sys/times.h sys/param.h sys/resource.h signal.h float.h stdio.h stdlib.h errno.h string.h ctype.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -192,7 +214,8 @@ AC_STRUCT_TM CONFIGURE_PART(Test Library Functions) dnl Checks for libraries. -AC_CHECK_FUNC(acos, , AC_CHECK_LIB(m, acos)) +AC_CHECK_FUNC(acos, , AC_CHECK_LIB(m, acos)) +AC_CHECK_FUNC(round, , AC_CHECK_LIB(m, round)) dnl add pic flag in any case this makes sure all our code is relocatable @@ -209,7 +232,7 @@ AC_C_BIGENDIAN dnl for each function found we get a definition in config.h dnl of the form HAVE_FUNCTION -AC_CHECK_FUNCS(tzset fsync mbstowcs opendir readdir chdir chroot getuid strerror snprintf vsnprintf vasprintf fpclass class fp_class isnan memmove strchr mktime getrusage gettimeofday) +AC_CHECK_FUNCS(nl_langinfo tzset fsync mbstowcs opendir readdir chdir chroot getuid strerror snprintf vsnprintf vasprintf fpclass class fp_class isnan memmove strchr mktime getrusage gettimeofday) AC_FUNC_STRERROR_R @@ -273,8 +296,8 @@ AC_CHECK_FUNCS(posix_fadvise) CONFIGURE_PART(Libintl Processing) -AM_GNU_GETTEXT_VERSION(0.14.4) -AM_GNU_GETTEXT() +AM_GNU_GETTEXT_VERSION(0.18) +AM_GNU_GETTEXT(external) CONFIGURE_PART(IEEE Math Checks) @@ -345,6 +368,12 @@ CONFIGURE_PART(Resolve Portability Issues) CHECK_FOR_WORKING_MS_ASYNC +dnl do we have nl_langinfo(_NL_TIME_WEEK_1STDAY) +AC_CHECK_FUNCS(_NL_TIME_WEEK_1STDAY, , + [AC_MSG_CHECKING([for nl_langinfo(_NL_TIME_WEEK_1STDAY) with langinfo.h]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[nl_langinfo(_NL_TIME_WEEK_1STDAY)]])],[AC_MSG_RESULT(yes) + AC_DEFINE(HAVE__NL_TIME_WEEK_1STDAY)],[AC_MSG_RESULT(no)])]) + dnl Do we need getopt_long dnl even when including our own getopt implementation @@ -459,26 +488,26 @@ AC_LINK_IFELSE( ] ) -dnl is time_t long or long long ? -AC_DEFINE([TIME_T_IS_LONG], [], [time_t is long]) -AC_DEFINE([TIME_T_IS_LONG_LONG], [], [time_t is long long]) +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(long) != sizeof(time_t)) return 1; ]] + [[if (sizeof(time_t) != 4) return 1; ]] ), - [ AC_MSG_RESULT([time_t is long]) - AC_DEFINE([TIME_T_IS_LONG]) + [ AC_MSG_RESULT([time_t is 32 bit]) + AC_DEFINE([TIME_T_IS_32BIT]) ], [ AC_RUN_IFELSE( AC_LANG_PROGRAM( [[#include ]], - [[if (sizeof(long long) != sizeof(time_t)) return 1; ]] + [[if (sizeof(time_t) != 8) return 1; ]] ), [ - AC_MSG_RESULT([time_t is long long]) - AC_DEFINE([TIME_T_IS_LONG_LONG]) + AC_MSG_RESULT([time_t is 64 bit]) + AC_DEFINE([TIME_T_IS_64BIT]) ], [AC_MSG_ERROR([can not figure type of time_t])] ) @@ -508,7 +537,6 @@ 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_RRDCGI,[test $enable_rrdcgi != no]) CORE_LIBS="$LIBS" @@ -522,7 +550,7 @@ EX_CHECK_ALL(cairo, cairo_svg_surface_create, cairo-svg.h, 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(pango-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(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 "$EX_CHECK_ALL_ERR" = "YES"; then @@ -895,7 +923,6 @@ AC_CONFIG_FILES([examples/Makefile]) AC_CONFIG_FILES([examples/rrdcached/Makefile]) AC_CONFIG_FILES([doc/Makefile]) AC_CONFIG_FILES([po/Makefile.in]) -AC_CONFIG_FILES([intl/Makefile]) AC_CONFIG_FILES([src/Makefile]) AC_CONFIG_FILES([src/librrd.sym.in]) AC_CONFIG_FILES([src/librrd.pc]) @@ -955,6 +982,7 @@ echo " Build rrdcgi: $enable_rrdcgi" echo " Build librrd MT: $enable_pthread" echo " Use gettext: $USE_NLS" echo " With libDBI: $have_libdbi" +echo " With libwrap: $have_libwrap" echo echo " Libraries: $ALL_LIBS" echo