X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=configure.ac;h=ab210d156016adc72dcde0ee5b69c7e54bff9219;hp=7fe70bcdca18331bc5c2b11102c9823ebac5365d;hb=58e33c38668afe88b2e45c9aca017b46a92537ca;hpb=70daf3dfec23ebb024de446c476efe3b217cbba6 diff --git a/configure.ac b/configure.ac index 7fe70bc..ab210d1 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ dnl - if any functionality was removed do c++,r=0,a=0. dnl dnl see http://sourceware.org/autobook/autobook/autobook_91.html dnl -LIBVERS=6:999:2 +LIBVERS=6:255:2 AC_SUBST(LIBVERS) AC_CANONICAL_TARGET @@ -619,7 +619,7 @@ langpref=$prefix test "$langpref" = '$(DESTDIR)NONE' && langpref='$(DESTDIR)'$ac_default_prefix test "$langpref" = "NONE" && langpref=$ac_default_prefix -PERL_MAKE_OPTIONS="PREFIX=$langpref LIB=$langpref/lib/perl/$PERL_VERSION" +PERL_MAKE_OPTIONS="PREFIX=$langpref INSTALL_BASE= LIB=$langpref/lib/perl/$PERL_VERSION" dnl pass additional perl options when generating Makefile from Makefile.PL AC_ARG_ENABLE(perl-site-install, @@ -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) @@ -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