From 9189e864b14dfb8daa119065f216062ecc6f1bb2 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Tue, 10 May 2016 08:33:42 +0200 Subject: [PATCH] build system: rename riemann-c to libriemann-client ... to make this consistent with the other plugins --- configure.ac | 10 +++++----- src/Makefile.am | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 1fcab1c8..c3bd6ca3 100644 --- a/configure.ac +++ b/configure.ac @@ -5297,9 +5297,9 @@ PKG_CHECK_MODULES([LIBNOTIFY], [libnotify], [with_libnotify="no (pkg-config doesn't know libnotify)"] ) -PKG_CHECK_MODULES([RIEMANN_C], [riemann-client >= 1.8.0], - [with_riemann_c="yes"], - [with_riemann_c="no (pkg-config doesn't know riemann-c-client)"]) +PKG_CHECK_MODULES([LIBRIEMANN_CLIENT], [riemann-client >= 1.8.0], + [with_libriemann_client="yes"], + [with_libriemann_client="no (pkg-config doesn't know libriemann-client)"]) # Check for enabled/disabled features # @@ -5961,7 +5961,7 @@ AC_PLUGIN([write_kafka], [$with_librdkafka], [Kafka output plugin AC_PLUGIN([write_log], [yes], [Log output plugin]) AC_PLUGIN([write_mongodb], [$with_libmongoc], [MongoDB output plugin]) AC_PLUGIN([write_redis], [$with_libhiredis], [Redis output plugin]) -AC_PLUGIN([write_riemann], [$with_riemann_c], [Riemann output plugin]) +AC_PLUGIN([write_riemann], [$with_libriemann_client], [Riemann output plugin]) AC_PLUGIN([write_sensu], [yes], [Sensu output plugin]) AC_PLUGIN([write_tsdb], [yes], [TSDB output plugin]) AC_PLUGIN([xencpu], [$plugin_xencpu], [Xen Host CPU usage]) @@ -6205,6 +6205,7 @@ Configuration: libpq . . . . . . . . $with_libpq libpthread . . . . . $with_libpthread librabbitmq . . . . . $with_librabbitmq + libriemann-client . . $with_libriemann_client librdkafka . . . . . $with_librdkafka librouteros . . . . . $with_librouteros librrd . . . . . . . $with_librrd @@ -6223,7 +6224,6 @@ Configuration: oracle . . . . . . . $with_oracle protobuf-c . . . . . $have_protoc_c python . . . . . . . $with_python - riemann-c-client . . $with_riemann_c Features: daemon mode . . . . . $enable_daemon diff --git a/src/Makefile.am b/src/Makefile.am index 72c1c95f..23c3a2f4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1261,8 +1261,8 @@ endif if BUILD_PLUGIN_WRITE_RIEMANN pkglib_LTLIBRARIES += write_riemann.la write_riemann_la_SOURCES = write_riemann.c write_riemann_threshold.c write_riemann_threshold.h -write_riemann_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(RIEMANN_C_LIBS) -write_riemann_la_CFLAGS = $(AM_CFLAGS) $(RIEMANN_C_CFLAGS) +write_riemann_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBRIEMANN_CLIENT_LIBS) +write_riemann_la_CFLAGS = $(AM_CFLAGS) $(LIBRIEMANN_CLIENT_CFLAGS) endif if BUILD_PLUGIN_WRITE_SENSU -- 2.30.2