From c3cfa4bb8d3c986b4c6744d73defa8eba08fcb72 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 24 Jan 2014 09:04:29 +0100 Subject: [PATCH] configure, src/Makefile: Sort plugins alphabetically. --- configure.ac | 9 +++++++-- src/Makefile.am | 16 ++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index c0a25c1..5cae366 100644 --- a/configure.ac +++ b/configure.ac @@ -404,10 +404,14 @@ AC_SDB_PLUGIN([mk-livestatus], [yes], [backend accessing Nagios/Icinga/Shinken using MK Livestatus]) AC_SDB_PLUGIN([puppet-storeconfigs], [$puppet_storeconfigs_default], [backend accessing the Puppet stored configuration database]) -AC_SDB_PLUGIN([syslog], [yes], - [plugin logging to syslog]) + +m4_divert_once([HELP_ENABLE], [ +Plugins:]) + AC_SDB_PLUGIN([cname-dns], [yes], [canonicalize hostnames by querying DNS]) +AC_SDB_PLUGIN([syslog], [yes], + [plugin logging to syslog]) AM_CONDITIONAL([BUILD_DOCUMENTATION], test "x$build_documentation" = "xyes") AM_CONDITIONAL([BUILD_TESTING], test "x$build_testing" = "xyes") @@ -451,6 +455,7 @@ AC_MSG_RESULT([ puppet-storeconfigs: . . . $enable_puppet_storeconfigs]) AC_MSG_RESULT() AC_MSG_RESULT([ Plugins:]) AC_MSG_RESULT([ cname::dns: . . . . . . . . $enable_cname_dns]) +AC_MSG_RESULT([ syslog: . . . . . . . . . . $enable_syslog]) AC_MSG_RESULT() AC_MSG_RESULT([This package is maintained by $PACKAGE_MAINTAINER.]) AC_MSG_RESULT([Please report bugs to $PACKAGE_BUGREPORT.]) diff --git a/src/Makefile.am b/src/Makefile.am index 9206e27..cdadd60 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -129,6 +129,14 @@ pkgbackendcollectdlib_LTLIBRARIES = pkgbackendpuppetlib_LTLIBRARIES = pkgcnamelib_LTLIBRARIES = +if BUILD_PLUGIN_CNAMEDNS +pkgcnamelib_LTLIBRARIES += plugins/cname/dns.la +plugins_cname_dns_la_SOURCE = plugins/cname/dns.c +plugins_cname_dns_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version +libsysdb_la_LIBADD += -dlopen plugins/cname/dns.la +libsysdb_la_DEPENDENCIES += plugins/cname/dns.la +endif + if BUILD_PLUGIN_COLLECTD pkgbackendcollectdlib_LTLIBRARIES += backend/collectd/unixsock.la backend_collectd_unixsock_la_SOURCES = backend/collectd/unixsock.c @@ -161,14 +169,6 @@ libsysdb_la_LIBADD += -dlopen plugins/syslog.la libsysdb_la_DEPENDENCIES += plugins/syslog.la endif -if BUILD_PLUGIN_CNAMEDNS -pkgcnamelib_LTLIBRARIES += plugins/cname/dns.la -plugins_cname_dns_la_SOURCE = plugins/cname/dns.c -plugins_cname_dns_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -libsysdb_la_LIBADD += -dlopen plugins/cname/dns.la -libsysdb_la_DEPENDENCIES += plugins/cname/dns.la -endif - include/client/sysdb.h: include/client/sysdb.h.in ../version source ../version; sed \ -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \ -- 2.30.2