X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=a0bd955011706ed6a1c2da0250fb06a5602c5a56;hb=92b77493980c67a4fde8ae001ac4b939210d6a8d;hp=6ee7b2f9c9915607f1a53f974cc551293a054685;hpb=8fafd09727d58545c1229ca84b94f0082af6a528;p=rrdtool.git

diff --git a/configure.ac b/configure.ac
index 6ee7b2f..a0bd955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,11 @@ AH_BOTTOM([
 # include <features.h>
 #endif
 
+/* FreeBSD 4.8 wants this included BEFORE sys/types.h */
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
+
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -91,10 +96,6 @@ AH_BOTTOM([
 # include <errno.h>
 #endif
 
-#ifdef HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-#endif
-
 #if !defined HAVE_MADVISE && defined HAVE_POSIX_MADVISE
 /* use posix_madvise family */
 # define madvise posix_madvise
@@ -291,8 +292,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 +613,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 +743,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,