From 856c407976d5095c13b243b9ab2be6a4dcf8deb5 Mon Sep 17 00:00:00 2001 From: Roland Franke Date: Mon, 18 Jul 2016 14:12:22 +0200 Subject: rrdtool: bump version to 1.6.0 - Remove patch 0001-Add-configure-option-to-disable-documentation.patch as this is now include in the new version. - Add dependency on gettext when needed, since it uses libintl if gettext functionality is not provided by the C library. - Keep autoreconf/gettextize, which are needed for the link against libintl to work properly. Signed-off-by: Roland Franke [Thomas: - add dependency on gettext when needed - add comment about why autoreconf/gettextize are kept - cleanup commit log.] Signed-off-by: Thomas Petazzoni --- ...configure-option-to-disable-documentation.patch | 71 ---------------------- 1 file changed, 71 deletions(-) delete mode 100644 package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch (limited to 'package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch') diff --git a/package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch b/package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch deleted file mode 100644 index afb62927de..0000000000 --- a/package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch +++ /dev/null @@ -1,71 +0,0 @@ -From deaef0790f3cbbce826275d3564551fc9568b628 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 2 Dec 2015 14:31:52 -0300 -Subject: [PATCH] Add configure option to disable documentation - -Signed-off-by: Gustavo Zacarias ---- - Makefile.am | 6 +++++- - configure.ac | 8 ++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index f45975c..1f46a9b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -5,7 +5,11 @@ RSYNC = rsync --rsh=ssh - - # build the following subdirectories - --SUBDIRS = po src doc bindings tests -+SUBDIRS = po src bindings tests -+ -+if BUILD_DOCS -+SUBDIRS += doc -+endif - - if BUILD_EXAMPLES - SUBDIRS += examples -diff --git a/configure.ac b/configure.ac -index dc70e7d..7460c67 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,6 +100,9 @@ AC_ARG_VAR(RRDGRAPH_YLEGEND_ANGLE, - AC_DEFINE_UNQUOTED(RRDGRAPH_YLEGEND_ANGLE,${RRDGRAPH_YLEGEND_ANGLE:-90.0}, - [Vertical label angle: -90.0 (default) or 90.0]) - -+AC_ARG_ENABLE(docs,AS_HELP_STRING([--disable-docs],[disable building documentation]), -+[],[enable_docs=yes]) -+ - AC_ARG_ENABLE(examples,AS_HELP_STRING([--disable-examples],[disable building of examples]), - [],[enable_examples=yes]) - -@@ -115,6 +118,7 @@ AC_ARG_ENABLE(rrd_graph,AS_HELP_STRING([--disable-rrd_graph],[disable all rrd_gr - AC_ARG_ENABLE(rrd_restore,AS_HELP_STRING([--disable-rrd_restore],[disable rrd_restore XML import functions]), - [],[enable_rrd_restore=yes]) - -+AM_CONDITIONAL(BUILD_DOCS,[test $enable_docs != no]) - AM_CONDITIONAL(BUILD_EXAMPLES,[test $enable_examples != no]) - AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no]) - AM_CONDITIONAL(BUILD_RRDCACHED,[test $enable_rrdcached != no]) -@@ -945,6 +949,8 @@ fi - - AC_SUBST(COMP_PYTHON) - -+if test $enable_docs != no; then -+ - dnl Check for nroff - AC_ARG_VAR(NROFF, [path to the local nroff version]) - AC_PATH_PROGS(NROFF, [gnroff nroff]) -@@ -961,6 +967,8 @@ AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] Documentation directory]) - if test -z "$RRDDOCDIR"; then - RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi - -+fi -+ - # systemd check - PKG_PROG_PKG_CONFIG - AC_ARG_WITH([systemdsystemunitdir], --- -2.4.10 - -- cgit v1.2.3