build fixes by Guenter Knauf

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@1449 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/netware/Makefile b/program/netware/Makefile
index e8d6a4730f6305865e6818bac49de5a436b30927..104e532789243e2097362e96b4f26aa038a6d321 100644 (file)
--- a/program/netware/Makefile
+++ b/program/netware/Makefile
@@ -6,7 +6,7 @@
 #
 
 DESCR  = Round Robin Database Tool $(RRD_VERSION_STR)
-COPYR  = Copyright (c) 1997-2007 by Tobias Oetiker
+COPYR  = Copyright (c) 1997-2008 by Tobias Oetiker
 WWWURL = http://www.rrdtool.org/
 MTSAFE = YES
 #SCREEN        = $(DESCR)
@@ -42,11 +42,11 @@ endif
 # All library code is statically linked to avoid problems with other lib NLMs.
 # Edit the path below to point to your libpng sources or set environment var.
 ifndef LIBPNG
-LIBPNG = $(LIBBASE)/libpng-1.2.23
+LIBPNG = $(LIBBASE)/libpng-1.2.29
 endif
 # Edit the path below to point to your freetype sources or set environment var.
 ifndef LIBFT2
-LIBFT2 = $(LIBBASE)/freetype-2.3.5
+LIBFT2 = $(LIBBASE)/freetype-2.3.7
 endif
 # Edit the path below to point to your libart sources or set environment var.
 ifndef LIBART
@@ -103,14 +103,14 @@ FIXNLMN   = fixnlmname #-q
 # http://www.gknw.net/development/prgtools/awk.zip
 AWK    = awk
 MV     = mv -fv
-ifndef ARCBIN
+
+ifeq ($(ARCEXT),7z)
+ARCBIN = 7za a
+else
 ARCBIN = zip -qzr9
 ARCEXT = zip
-#ARCBIN        = 7za a
-#ARCEXT        = 7z
 endif
 
-
 # must be equal to DEBUG or NDEBUG
 DB     = NDEBUG
 # DB   = DEBUG

diff --git a/program/src/rrd_tool.h b/program/src/rrd_tool.h
index 22c404f960cb4e15794fd37449c6d3b700d869ce..4d2d6a8ead4544d27136f09fdd10fa9687cfe681 100644 (file)
--- a/program/src/rrd_tool.h
+++ b/program/src/rrd_tool.h
@@ -83,6 +83,10 @@ extern "C" {
 
 #include <float.h>        /* for _isnan  */
 #include <io.h>           /* for chdir   */
+#include <process.h>      /* for getpid  */
+
+#define random rand
+#define srandom srand
 
 struct tm* localtime_r(const time_t *timep, struct tm* result);
 char* ctime_r(const time_t *timep, char* result);

diff --git a/program/win32/Makefile b/program/win32/Makefile
index 6e3dc2c7728d8f8110dd66614c4387e9d46df9de..528caf596261d7b62b96a817a5073b60fffefd4e 100644 (file)
--- a/program/win32/Makefile
+++ b/program/win32/Makefile
@@ -6,7 +6,7 @@
 #
 
 DESCR  = Round Robin Database Tool
-COPYR  = Copyright (c) 1997-2007 by Tobias Oetiker
+COPYR  = Copyright (c) 1997-2008 by Tobias Oetiker
 WWWURL = http://www.rrdtool.org/
 ICON   = $(PROOT)/favicon.ico
 
@@ -33,12 +33,12 @@ endif
 # All library code is statically linked to avoid problems with other lib DLLs.
 # Edit the path below to point to your libpng sources or set environment var.
 ifndef LIBPNG
-LIBPNG = $(LIBBASE)/libpng-1.2.23
+LIBPNG = $(LIBBASE)/libpng-1.2.29
 endif
 # Edit the path below to point to your freetype sources or set environment var.
 ifndef LIBFT2
-#LIBFT2        = $(LIBBASE)/freetype-2.3.5
-LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.3.5
+#LIBFT2        = $(LIBBASE)/freetype-2.3.7
+LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.3.7
 endif
 # Edit the path below to point to your libart sources or set environment var.
 ifndef LIBART
@@ -79,11 +79,12 @@ CP  = cp -afv
 # Here you can find a native Win32 binary of the original awk:
 # http://www.gknw.net/development/prgtools/awk.zip
 AWK    = awk
-ifndef ARCBIN
+
+ifeq ($(ARCEXT),7z)
+ARCBIN = 7za a
+else
 ARCBIN = zip -qzr9
 ARCEXT = zip
-#ARCBIN        = 7za a
-#ARCEXT        = 7z
 endif
 
 # must be equal to DEBUG or NDEBUG