updated

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

diff --git a/program/MakeMakefile b/program/MakeMakefile
index 75dd4e0ee0323203c7ba68ef709e87670e40f32e..2047f1dc3b8f174e443077b3cdf005a7eb06e46e 100755 (executable)
--- a/program/MakeMakefile
+++ b/program/MakeMakefile
@@ -33,12 +33,13 @@ fi
 
 set -x
 find . -name Makefile | xargs rm -f
+find . -name "*.la" | xargs rm -f
 find . -name Makefile.in | xargs rm -f
 
 
 
 # wget ftp://ftp.gnu.org/gnu/libtool/libtool-1.4.2.tar.gz
-libtoolize --copy
+libtoolize --copy --force
 cp ltmain.sh config
 
 # wget ftp://sources.redhat.com/pub/automake/automake-1.5.tar.gz

diff --git a/program/configure.ac b/program/configure.ac
index 8b9f6955a1386904cbc3eb03dc8f80c7e9f15364..8840664da853e85c23c04b57f355aa566c5a9963 100644 (file)
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -445,7 +445,7 @@ AC_CONFIG_FILES([examples/shared-demo.pl                    \
           libraries/cgilib-0.4/Makefile                 \
           libraries/libart_lgpl-2.3.7/Makefile         \
           libraries/libpng-1.2.0/Makefile              \
-          libraries/zlib-1.1.3/Makefile                        \
+          libraries/zlib-1.1.4/Makefile                        \
           libraries/freetype-2.0.5/Makefile            \
           src/Makefile                                 \
           bindings/Makefile                             \

diff --git a/program/examples/bigtops.pl b/program/examples/bigtops.pl
index 52e77e4baf350f676ec24aa4ffe05aa4c69e82df..71fa980d94cfc9b78886a39579c3038367dec1ad 100755 (executable)
--- a/program/examples/bigtops.pl
+++ b/program/examples/bigtops.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /bin/perl
 
 #makes things work when run without install
 use lib qw( ../bindings/perl-shared/blib/lib ../bindings/perl-shared/blib/arch );
@@ -40,8 +40,6 @@ RRDs::graph "$name.png",
   "AREA:b#00b6e4:beta",
   "AREA:line#0022e9:alpha",
   "LINE3:line#ff0000",
-  "GRPINT:a:AVERAGE:Average a %lf",
-  "GRPINT:b:AVERAGE:Average b %lf";
 
 ;
 

diff --git a/program/examples/piped-demo.pl b/program/examples/piped-demo.pl
index 34a3ff88a9dd0e00db9a779fd44712a1642f9445..561d9267d3babd16c684e6aea311fff67b58b55d 100755 (executable)
--- a/program/examples/piped-demo.pl
+++ b/program/examples/piped-demo.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl 
+#! /bin/perl 
 
 #makes things work when run without install
 use lib qw( ../bindings/perl-piped/blib/lib  ../lib/perl );

diff --git a/program/examples/shared-demo.pl b/program/examples/shared-demo.pl
index 0a8bb2124dcd94fe8c5c2cd0c5202f2647ee60ee..437d4639ec3f7eca5e03635e00c70eac1002cdf2 100755 (executable)
--- a/program/examples/shared-demo.pl
+++ b/program/examples/shared-demo.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl 
+#! /bin/perl 
 
 
 END {

diff --git a/program/examples/stripes.pl b/program/examples/stripes.pl
index 5ee8f462a67986bff65f23621f5d46ac44390412..00ad667009d4e971ec03841b7654c5985411cb63 100755 (executable)
--- a/program/examples/stripes.pl
+++ b/program/examples/stripes.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /bin/perl
 
 #makes things work when run without install
 use lib qw( ../bindings/perl-shared/blib/lib ../bindings/perl-shared/blib/arch );