Merge remote-tracking branch 'origin/next' into thirteen

[people/teissler/ipfire-2.x.git] / lfs / rrdtool

diff --git a/lfs/rrdtool b/lfs/rrdtool
index 4aade20e3ebe17d79ad18e5d39b3e3e7e5901561..0237b89f2e48d5dff2f1c7a3c218f342b3e27809 100644 (file)
--- a/lfs/rrdtool
+++ b/lfs/rrdtool
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.15
+VER        = 1.4.7
 
 THISAPP    = rrdtool-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = bde8b12c202bc4e27fb9a9588a0aaddf
+$(DL_FILE)_MD5 = ffe369d8921b4dfdeaaf43812100c38f
 
 install : $(TARGET)
 
@@ -70,13 +70,16 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr/share/$(THISAPP) \
-           --exec-prefix=/usr --mandir=/usr/share/man --enable-perl-site-install \
-           --enable-local-libpng --enable-local-zlib --with-pic --enable-latin2 \
-           --disable-python --disable-tcl
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --disable-rrdcgi \
+               --enable-perl \
+               --enable-perl-site-install \
+               --disable-tcl \
+               --disable-ruby \
+               --disable-python
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
-       cd $(DIR_APP) && make site-perl-install
        -mkdir -p /srv/web/ipfire/html/graphs/
        chmod 777 /srv/web/ipfire/html/graphs/
        -mkdir -p /var/log/rrd/