From: oetiker Date: Tue, 27 Oct 2009 17:49:29 +0000 (+0000) Subject: * remove intl from build process ... someone who does actually need it should fix... X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b4fd5d71cb3e4bdb9e12cc22f3d1373123c7e050;p=rrdtool.git * remove intl from build process ... someone who does actually need it should fix this ... * make the code work on solaris 10 (tested on opencsw server farm. thanks!) git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1955 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/Makefile.am b/Makefile.am index 9e1a22b..358a666 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ RSYNC = rsync --rsh=ssh # build the following subdirectories -SUBDIRS = po src examples doc bindings intl +SUBDIRS = po src examples doc bindings # the following files are not mentioned in any other Makefile EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \ diff --git a/configure.ac b/configure.ac index f21892f..f438a87 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ AH_BOTTOM([ # include #endif -#include +#include "src/rrd_config_bottom.h" #endif ]) @@ -224,6 +224,12 @@ AC_CHECK_FUNCS(fdatasync, [], AC_CHECK_LIB(rt, fdatasync, [LIBS="${LIBS} -lrt"; dnl if there is no fdatasync we may get lucky with fsync AC_CHECK_FUNCS(fsync) +dnl check for socket and nsl solaris again ... we need this for the new rrd_daemon stuff + +AC_CHECK_FUNCS(socket, [], AC_CHECK_LIB(socket, socket, [LIBS="${LIBS} -lsocket"; AC_DEFINE(HAVE_SOCKET)],[])) +AC_CHECK_FUNCS(getaddrinfo, [], AC_CHECK_LIB(nsl, getaddrinfo, [LIBS="${LIBS} -lnsl"; AC_DEFINE(HAVE_GETADDRINFO)],[])) + + dnl XXX: dunno about windows.. add AC_CHECK_FUNCS(munmap) there too? if test "x$enable_mmap" = "xyes"; then diff --git a/src/rrd_client.c b/src/rrd_client.c index 034beca..0b69000 100644 --- a/src/rrd_client.c +++ b/src/rrd_client.c @@ -24,6 +24,7 @@ #include "rrd_tool.h" #include "rrd_client.h" +#include #include #include #include diff --git a/src/rrd_graph.h b/src/rrd_graph.h index c11ac2f..7a85f34 100644 --- a/src/rrd_graph.h +++ b/src/rrd_graph.h @@ -5,15 +5,15 @@ #define y1 cairo_y1 #define index cairo_index +/* this may configure __EXTENSIONS__ without which pango will fail to compile + so load this early */ +#include "../rrd_config.h" + #include #include #include #include -/* without this will not compile on solaris */ -#ifndef __EXTENSIONS__ -#define __EXTENSIONS__ -#endif #include diff --git a/src/rrd_restore.c b/src/rrd_restore.c index d351cba..6880be2 100644 --- a/src/rrd_restore.c +++ b/src/rrd_restore.c @@ -9,6 +9,9 @@ * $Id$ *************************************************************************** */ +#include "rrd_tool.h" +#include "rrd_rpncalc.h" + #include #include #include @@ -30,8 +33,6 @@ # define close _close #endif -#include "rrd_tool.h" -#include "rrd_rpncalc.h" #define ARRAY_LENGTH(a) (sizeof (a) / sizeof ((a)[0])) @@ -277,12 +278,7 @@ static int get_xml_double( xmlChar *text; double temp; - if ((text = (char *)get_xml_text(reader))!= NULL){ - char *c = text; - while (c){ - *c=tolower((unsigned char)(*c)); - c++; - } + if ((text = get_xml_text(reader))!= NULL){ if (xmlStrcasestr(text,(xmlChar *)"nan")){ *value = DNAN; xmlFree(text);