X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=configure.ac;h=ab210d156016adc72dcde0ee5b69c7e54bff9219;hp=0a68ceb69a7dd1408ec490c059f545e796f78014;hb=2f28002d6613be5c03edb76958b6aa6b300c8a80;hpb=6cb698792ee490b582aba2f36138b01e5beb4b8c diff --git a/configure.ac b/configure.ac index 0a68ceb..ab210d1 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 @@ -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:3:1 +LIBVERS=6:255:2 AC_SUBST(LIBVERS) AC_CANONICAL_TARGET @@ -102,26 +102,6 @@ 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]) AC_ARG_ENABLE(rrd_graph,AS_HELP_STRING([--disable-rrd_graph],[disable all rrd_graph functions]), @@ -226,7 +206,7 @@ AC_CHECK_FUNC(round, , AC_CHECK_LIB(m, round)) dnl add pic flag in any case this makes sure all our code is relocatable -eval `./libtool --config | grep pic_flag` +eval `./libtool --config | grep pic_flag=` CFLAGS="$CFLAGS $pic_flag" @@ -301,9 +281,12 @@ AC_CHECK_DECLS(posix_fadvise, [], [], [#define _XOPEN_SOURCE 600 #include ]) AC_CHECK_FUNCS(posix_fadvise) +dnl can we use posix_fallocate +AC_CHECK_FUNCS(posix_fallocate) + 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) @@ -373,6 +356,8 @@ AC_FULL_IEEE CONFIGURE_PART(Resolve Portability Issues) +GC_TIMEZONE() + CHECK_FOR_WORKING_MS_ASYNC dnl do we have nl_langinfo(_NL_TIME_WEEK_1STDAY) @@ -514,25 +499,40 @@ AC_LANG_POP(C) CONFIGURE_PART(Find 3rd-Party Libraries) -AC_ARG_ENABLE(libdbi,AS_HELP_STRING([--disable-libdbi],[do not build in support for libdbi]),[have_libdbi=no],[ - XXX=$LIBS - LIBS="$LIBS -ldbi -ldl" - AC_MSG_CHECKING(for libdbi) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[dbi_initialize(NULL)]] - ) - ],[AC_DEFINE(HAVE_LIBDBI,[1],[have got libdbi installed]) - AC_MSG_RESULT([yes]) - have_libdbi=yes - ],[LIBS=$XXX - AC_MSG_RESULT([no]) - have_libdbi=no - ] - ) +have_libdbi=no + +AC_ARG_ENABLE(libdbi,AS_HELP_STRING([--disable-libdbi],[do not build in support for libdbi]),[],[ + AC_CHECK_HEADER(dbi/dbi.h, [ + AC_CHECK_LIB(dbi, dbi_initialize, [ + AC_DEFINE(HAVE_LIBDBI,[1],[have got libdbi installed]) + LIBS="${LIBS} -ldbi -ldl" + have_libdbi=yes + ]) + ]) ]) + AM_CONDITIONAL(BUILD_LIBDBI,[test $have_libdbi != no]) +have_libwrap=no + +AC_ARG_ENABLE(libwrap, AS_HELP_STRING([--disable-libwrap], [do not build in support for libwrap (tcp wrapper)]),[],[ + AC_CHECK_HEADER(tcpd.h,[ + AC_CHECK_FUNCS(hosts_access, [ + AC_DEFINE(HAVE_LIBWRAP,[1],[have got libwrap installed]) + have_libwrap=yes + ], + [ + AC_CHECK_LIB(wrap, hosts_access, [ + AC_DEFINE(HAVE_LIBWRAP,[1],[have got libwrap installed]) + LIBS="${LIBS} -lwrap" + have_libwrap=yes + ]) + ]) + ]) +]) + + +AM_CONDITIONAL(BUILD_LIBWRAP,[test $have_libwrap != no]) AM_CONDITIONAL(BUILD_RRDGRAPH,[test $enable_rrd_graph != no]) @@ -540,20 +540,19 @@ AM_CONDITIONAL(BUILD_RRDGRAPH,[test $enable_rrd_graph != no]) CORE_LIBS="$LIBS" if test $enable_rrd_graph != no; then -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, "") +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(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.6.31, http://xmlsoft.org/downloads.html, /usr/include/libxml2) +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.]) @@ -620,7 +619,7 @@ langpref=$prefix test "$langpref" = '$(DESTDIR)NONE' && langpref='$(DESTDIR)'$ac_default_prefix test "$langpref" = "NONE" && langpref=$ac_default_prefix -PERL_MAKE_OPTIONS="PREFIX=$langpref LIB=$langpref/lib/perl/$PERL_VERSION" +PERL_MAKE_OPTIONS="PREFIX=$langpref INSTALL_BASE= LIB=$langpref/lib/perl/$PERL_VERSION" dnl pass additional perl options when generating Makefile from Makefile.PL AC_ARG_ENABLE(perl-site-install, @@ -845,7 +844,7 @@ if test "$enable_tcl" = "yes"; then withval="" AC_ARG_WITH(tcllib,[ --with-tcllib=DIR location of the tclConfig.sh]) enable_tcl=no - for dir in $withval /usr/lib /usr/local/lib /usr/lib/tcl8.4 /usr/lib/tcl8.3 ; do + for dir in $withval /usr/lib /usr/lib64 /usr/local/lib /usr/lib/tcl8.4 /usr/lib/tcl8.3 ; do AC_MSG_CHECKING(for tclConfig.sh in $dir) if test -f "$dir/tclConfig.sh" ; then tcl_config=$dir/tclConfig.sh @@ -919,6 +918,17 @@ AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] Documentation directory]) if test -z "$RRDDOCDIR"; then RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi +# systemd check +PKG_PROG_PKG_CONFIG +AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), + [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) +if test "x$with_systemdsystemunitdir" != xno; then + AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) + AC_OUTPUT([etc/rrdcached.socket etc/rrdcached.service]) +fi +AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) + CONFIGURE_PART(Apply Configuration Information) @@ -994,6 +1004,7 @@ echo " Build librrd MT: $enable_pthread" echo " Use gettext: $USE_NLS" echo " With libDBI: $have_libdbi" echo " With libwrap: $have_libwrap" +echo " With systemd dir: $with_systemdsystemunitdir" echo echo " Libraries: $ALL_LIBS" echo