X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=822626ea9865e6fe017799b8868aac4b502eda9e;hb=23c3b21499345ac8450166291773c5f6f136099c;hp=913dc5a0031bf8f9fbf546a45067c1e31d1be438;hpb=e1c12d5c14b4a716ea999204cedb13e98466ff15;p=rrdtool.git diff --git a/configure.ac b/configure.ac index 913dc5a..822626e 100644 --- a/configure.ac +++ b/configure.ac @@ -9,26 +9,25 @@ dnl tell automake the this script is for rrdtool dnl the official version number is dnl a.b.c -AC_INIT([rrdtool],[1.3rc3]) +AC_INIT([rrdtool],[1.3.0]) 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.299908051601 +NUMVERS=1.3000 AC_SUBST(NUMVERS) dnl for the linker to understand which version the library is compatible with dnl we must keep a separate library version cout of the format c:r:a if any -dnl functionality is changed do c++ prior to release dnl if only implementation changed but all interfaces are kept, do r++ -dnl when only functionality was added, do a++ if any functionality was -dnl removed to a=0. +dnl when only functionality was added do c++,r=0,a++ +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=3:1:1 +LIBVERS=4:0:0 AC_SUBST(LIBVERS) AC_CANONICAL_TARGET @@ -356,8 +355,9 @@ CONFIGURE_PART(Audit Compilation Environment) dnl Check for the compiler and static/shared library creation. -AC_PROG_CC AC_PROG_CPP +AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_LIBTOOL dnl Try to detect/use GNU features @@ -477,20 +477,27 @@ AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package]) AM_GLIB_GNU_GETTEXT() -IT_PROG_INTLTOOL([0.35.0],[no-xml]) AC_ARG_ENABLE(libintl,[ --disable-libintl i18n support (libintl)], [],[enable_libintl=yes]) if test x$enable_libintl = xyes; then + IT_PROG_INTLTOOL([0.35.0],[no-xml]) +fi + +if test x$enable_libintl = xyes -a x$MSGFMT = xno; then + AC_MSG_WARN(I could not find msgfmt. Diabeling libintl build.) + enable_libintl=no +fi +if test x$enable_libintl = xyes; then AC_CHECK_HEADERS(libintl.h,[],[AC_MSG_RESULT(disabeling libintl build); enable_libintl=no]) +fi - if test x$enable_libintl = xyes ; then -dnl it seems bsd synstems need to link against libintl -dnl when compiling rrdupdate. lets check - AC_CHECK_LIB(intl, libintl_gettext,[LIB_LIBINTL="-lintl"]) - fi +if test x$enable_libintl = xyes ; then + dnl it seems bsd synstems need to link against libintl + dnl when compiling rrdupdate. lets check + AC_CHECK_LIB(intl, libintl_gettext,[LIB_LIBINTL="-lintl"]) fi dnl use for linking rrdupdate @@ -499,6 +506,9 @@ AC_SUBST(LIB_LIBINTL) dnl do not touch the po stuff if we are not going to build intl AM_CONDITIONAL(BUILD_LIBINTL,[test x$enable_libintl = xyes]) +if test x$enable_libintl = xyes; then + AC_DEFINE([BUILD_LIBINTL], [], [Use this in code sections to mark them for libintl build]) +fi CONFIGURE_PART(IEEE Math Checks) @@ -508,7 +518,7 @@ AC_CHECK_FUNCS(fpclassify, , [AC_MSG_CHECKING(for fpclassify with ) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include volatile int x;volatile float f; ]], [[x = fpclassify(f)]])],[AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_FPCLASSIFY,1)],[AC_MSG_RESULT(no)])]) + AC_DEFINE(HAVE_FPCLASSIFY)],[AC_MSG_RESULT(no)])]) AC_CHECK_FUNCS(isinf, , [AC_MSG_CHECKING(for isinf with ) @@ -665,7 +675,7 @@ EX_CHECK_ALL(cairo, cairo_font_options_create, cairo.h, 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/, "") -dnl 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(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(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.6.31, http://xmlsoft.org/downloads.html, /usr/include/libxml2) @@ -844,6 +854,9 @@ if test "$enable_tcl" = "yes"; then else . $tcl_config TCL_PACKAGE_DIR="$TCL_PACKAGE_PATH/tclrrd$VERSION" + if test -n "$TCL_INC_DIR"; then + TCL_INCLUDE_SPEC="$TCL_INCLUDE_SPEC -I$TCL_INC_DIR" + fi fi AC_ARG_ENABLE(tcl,[ --enable-tcl-site install the tcl extension in the tcl tree], [],[enable_tcl_site=yes]) @@ -863,7 +876,7 @@ AC_SUBST(TCL_LD_SEARCH_FLAGS) AC_SUBST(TCL_STUB_LIB_SPEC) AC_SUBST(TCL_VERSION) AC_SUBST(TCL_PACKAGE_DIR) -AC_SUBST(TCL_INC_DIR) +AC_SUBST(TCL_INCLUDE_SPEC) AC_ARG_ENABLE(python,[ --disable-python do not build the python modules], [],[enable_python=yes])