From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 29 Sep 2014 22:40:06 +0000 (+0200)
Subject: fix glib-2.0 dependency problem in rrdcached build
X-Git-Tag: v1.4.9~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43d0f7f3771161025fc5401f2fe50d5d1cfdee19;p=thirdparty%2Frrdtool-1.x.git

fix glib-2.0 dependency problem in rrdcached build
---

diff --git a/configure.ac b/configure.ac
index 6dc4bba1..9e934595 100644
--- a/configure.ac
+++ b/configure.ac
@@ -525,6 +525,10 @@ AM_CONDITIONAL(BUILD_RRDGRAPH,[test $enable_rrd_graph != no])
 
 CORE_LIBS="$LIBS"
 
+EX_CHECK_ALL(glib-2.0,   glib_check_version,            glib.h,                 glib-2.0,    2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "")
+GLIB_LIBS=$THIS_LIB
+AC_SUBST(GLIB_LIBS)
+
 if test $enable_rrd_graph != no; then
 dnl EX_CHECK_ALL(z,          zlibVersion,               zlib.h,                 zlib,        1.2.5,  http://zlib.net/, "")
 dnl EX_CHECK_ALL(png,        png_access_version_number, png.h,                  libpng,      1.4.8,  ftp://ftp.simplesystems.org/pub/libpng/png/src/, "")
@@ -535,9 +539,7 @@ EX_CHECK_ALL(cairo,      cairo_svg_surface_create,      cairo-svg.h,
 EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,            cairo-pdf,   1.10.2,  http://cairographics.org/releases/, "")
 EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,             cairo-ps,    1.10.2,  http://cairographics.org/releases/, "")
 EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
-
 fi
-EX_CHECK_ALL(glib-2.0,   glib_check_version,            glib.h,                 glib-2.0,    2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "")
 EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.7.8,  http://xmlsoft.org/downloads.html, /usr/include/libxml2)
 
 if test "$EX_CHECK_ALL_ERR" = "YES"; then
diff --git a/doc/RRDp.pod b/doc/RRDp.pod
deleted file mode 120000
index 11703f76..00000000
--- a/doc/RRDp.pod
+++ /dev/null
@@ -1 +0,0 @@
-../bindings/perl-piped/RRDp.pm
\ No newline at end of file
diff --git a/doc/RRDs.pod b/doc/RRDs.pod
deleted file mode 120000
index 30a99d2c..00000000
--- a/doc/RRDs.pod
+++ /dev/null
@@ -1 +0,0 @@
-../bindings/perl-shared/RRDs.pm
\ No newline at end of file
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 6aed2238..5eff6de6 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -35,6 +35,7 @@ AC_DEFUN([EX_CHECK_ALL],
              LDFLAGS=${LDFLAGS}" "`$PKGCONFIG --libs-only-L $4`
              LDFLAGS=${LDFLAGS}" "`$PKGCONFIG --libs-only-other $4`
              LIBS=${LIBS}" "`$PKGCONFIG --libs-only-l $4`
+             THIS_LIB=`$PKGCONFIG --libs-only-l $4`
 	     dnl remove the cached value and test again
     	     unset ac_cv_lib_`echo $1 | sed ['s/[^_a-zA-Z0-9]/_/g;s/^[0-9]/_/']`_$2
              AC_CHECK_LIB($1,$2,[
diff --git a/src/Makefile.am b/src/Makefile.am
index f0a54485..d9993b95 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,9 +9,8 @@ if STATIC_PROGRAMS
 AM_LDFLAGS = -all-static
 endif
 
-INCLUDES = -DLOCALEDIR="\"$(datadir)/locale\""
 RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
-AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
+AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@ -DLOCALEDIR="\"$(datadir)/locale\"" 
 AM_CFLAGS = @CFLAGS@
 ## no including this by default @WERROR@
 
@@ -116,6 +115,7 @@ rrdtool_LDADD	= librrd.la
 rrdcached_SOURCES = rrd_daemon.c
 rrdcached_DEPENDENCIES = librrd_th.la
 rrdcached_CPPFLAGS = -DVERSION='"$(VERSION)"' -DLOCALSTATEDIR='"$(localstatedir)"'
+rrdcached_LIBADD = $(GLIB_LIBS)
 rrdcached_LDADD = librrd_th.la
 
 pkgconfigdir = $(libdir)/pkgconfig