Skip to content

Commit

Permalink
wire up systemd support in autoconf -- [email protected]
Browse files Browse the repository at this point in the history
git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2291 a5681a0c-68f1-0310-ab6d-d61299d08faa
  • Loading branch information
oetiker committed Jul 2, 2012
1 parent 8527e90 commit afcd0eb
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ ACLOCAL_M4= $(top_srcdir)/aclocal.m4

# $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz [email protected]:/ipn/web/Tools/RRDtool/pub/

if HAVE_SYSTEMD
systemdsystemunit_DATA = \
etc/rrdcached.socket \
etc/rrdcached.service
endif

site-perl-inst: site-perl-install

site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile
Expand Down
12 changes: 12 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,17 @@ AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] Documentation directory])
if test -z "$RRDDOCDIR"; then
RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi

# systemd check
PKG_PROG_PKG_CONFIG
AC_ARG_WITH([systemdsystemunitdir],
AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
[], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
if test "x$with_systemdsystemunitdir" != xno; then
AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
AC_OUTPUT([etc/rrdcached.socket etc/rrdcached.service])
fi
AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])


CONFIGURE_PART(Apply Configuration Information)

Expand Down Expand Up @@ -993,6 +1004,7 @@ echo " Build librrd MT: $enable_pthread"
echo " Use gettext: $USE_NLS"
echo " With libDBI: $have_libdbi"
echo " With libwrap: $have_libwrap"
echo " With systemd dir: $with_systemdsystemunitdir"
echo
echo " Libraries: $ALL_LIBS"
echo
Expand Down
2 changes: 2 additions & 0 deletions doc/rrdcached.pod
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,8 @@ accepted commands to those needed by external clients. If, for example,
external clients want to draw graphs of the cached data, they should only be
allowed to use the C<FLUSH> command.

Authorization does not work when rrcached is socket-activated by systemd.

=head2 Encryption

There is no encryption.
Expand Down

0 comments on commit afcd0eb

Please sign in to comment.