* remove intl from build process ... someone who does actually need it should fix...

* make the code work on solaris 10 (tested on opencsw server farm. thanks!)

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1955 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/Makefile.am b/program/Makefile.am
index 9e1a22b9dfbd703c48464ef1383b8e0605af04a9..358a666ca0ba4d4d75e8139df54af35eb161d69b 100644 (file)
--- a/program/Makefile.am
+++ b/program/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/program/configure.ac b/program/configure.ac
index f21892fb6022050f722a2e606630ff2023d4ee77..f438a87e6b0d36c137f810c440671883d135999b 100644 (file)
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -85,7 +85,7 @@ AH_BOTTOM([
 #  include <malloc/malloc.h>
 #endif
 
-#include <rrd_config_bottom.h>
+#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/program/src/rrd_client.c b/program/src/rrd_client.c
index 034beca9471a6a9ed7899e6c6f65d8b3322d386b..0b69000f26b1e01e0469289f31ef0f8c510fe776 100644 (file)
--- a/program/src/rrd_client.c
+++ b/program/src/rrd_client.c
@@ -24,6 +24,7 @@
 #include "rrd_tool.h"
 #include "rrd_client.h"
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>

diff --git a/program/src/rrd_graph.h b/program/src/rrd_graph.h
index c11ac2fea851dc921420c1f6a07d9d21578483f0..7a85f340689ccd9173b9c30be2ab784a9d43fe79 100644 (file)
--- a/program/src/rrd_graph.h
+++ b/program/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 <cairo.h>
 #include <cairo-pdf.h>
 #include <cairo-svg.h>
 #include <cairo-ps.h>
 
-/* without this will not compile on solaris */
-#ifndef __EXTENSIONS__
-#define __EXTENSIONS__
-#endif
 #include <pango/pangocairo.h>
 
 

diff --git a/program/src/rrd_restore.c b/program/src/rrd_restore.c
index d351cba169c6f8152bac6b7e9b3544107c20a9e6..6880be2f7c5d83444225d809dc0f3715ee5faceb 100644 (file)
--- a/program/src/rrd_restore.c
+++ b/program/src/rrd_restore.c
@@ -9,6 +9,9 @@
  * $Id$
  *************************************************************************** */
 
+#include "rrd_tool.h"
+#include "rrd_rpncalc.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -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);