X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=configure.ac;h=8928d628f2074b5a2ce7370503c3cea0fa51736a;hp=10603bdb05f391a29c2936f1b1e9ae4d5bcd6562;hb=5eb668e476439e7f7fe7e6f757e637056cb9c69d;hpb=73a6c71d15d42b54355e044f0c5ee14544c0cf05 diff --git a/configure.ac b/configure.ac index 10603bd..8928d62 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 @@ -102,24 +102,24 @@ 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]) +have_libwrap=no + 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 - ] - ) -]) + [do not build in support for libwrap (tcp wrapper)] + ), + [], + [ + AC_CHECK_FUNCS(hosts_access, [], + AC_CHECK_LIB(wrap, hosts_access, [ + LIBS="${LIBS} -lwrap" + AC_DEFINE(HAVE_LIBWRAP,[1],[have got libwrap installed]) + have_libwrap=yes + ],[]) + ) + ] +) + AM_CONDITIONAL(BUILD_LIBWRAP,[test $have_libwrap != no]) AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no]) @@ -211,7 +211,7 @@ CONFIGURE_PART(Checking for Header Files) dnl Checks for header files. AC_HEADER_STDC AC_HEADER_DIRENT -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) +AC_CHECK_HEADERS(tcpd.h dbi/dbi.h 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 @@ -226,7 +226,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" @@ -303,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) @@ -514,23 +514,16 @@ 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_LIB(dbi, dbi_initialize, [ + LIBS="${LIBS} -ldbi -ldl" + AC_DEFINE(HAVE_LIBDBI,[1],[have got libdbi installed]) + have_libdbi=yes + ],[],[-ldl]) ]) + AM_CONDITIONAL(BUILD_LIBDBI,[test $have_libdbi != no]) @@ -540,20 +533,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.]) @@ -904,8 +896,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