X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=48c03c649540b75778bc209631647117db3147a7;hb=cbb3228d48d37485dbf539289b5ad685073416d9;hp=6ee7b2f9c9915607f1a53f974cc551293a054685;hpb=8fafd09727d58545c1229ca84b94f0082af6a528;p=rrdtool.git diff --git a/configure.ac b/configure.ac index 6ee7b2f..48c03c6 100644 --- a/configure.ac +++ b/configure.ac @@ -291,8 +291,7 @@ dnl gettext GETTEXT_PACKAGE=rrdtool AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package]) -IT_PROG_INTLTOOL([0.35.0]) - +IT_PROG_INTLTOOL([0.35.0],[no-xml]) AM_GLIB_GNU_GETTEXT dnl How the vertical axis label is printed @@ -613,6 +612,7 @@ EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h, 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(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) if test "$EX_CHECK_ALL_ERR" = "YES"; then AC_MSG_ERROR([Please fix the library issues listed above and try again.]) @@ -742,7 +742,7 @@ AC_ARG_ENABLE(ruby-site-install, together with rrdtool in $prefix/lib/ruby. You have to add $prefix/lib/ruby/$ruby_version/$sitearch to you $: variable for ruby to find the RRD.so file.], -[RUBY_MAKE_OPTIONS=],[RUBY_MAKE_OPTIONS="sitedir=$prefix/lib/ruby"]) +[RUBY_MAKE_OPTIONS=],[RUBY_MAKE_OPTIONS="sitedir="'$(DESTDIR)'"$prefix/lib/ruby"]) AC_ARG_WITH(ruby-options,