do not install systemd support automatically. fix for #798

diff --git a/Makefile.am b/Makefile.am
index 5bb6325f9ddc4ce4409cb329fcf92d3b751d9ddd..ffefe7b761959ba7c99cc1b415e70147f066af6d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,11 +36,8 @@ ACLOCAL_M4= $(top_srcdir)/aclocal.m4
 
 #      $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
 
-if HAVE_SYSTEMD
-systemdsystemunit_DATA = \
-       etc/rrdcached.socket \
-       etc/rrdcached.service
-endif
+etc-install:
+       cd etc && $(MAKE) install
 
 site-perl-inst: site-perl-install
 

diff --git a/Makefile.in b/Makefile.in
index af52a45720faf2dd5b28283c033402e6d481774f..205795bc0a7342387b3f14055dedf3908dc360a6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,6 @@
 @SET_MAKE@
 
 # $Id$
-
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -112,8 +111,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/rrd_config.h
-CONFIG_CLEAN_FILES = etc/rrdcached.socket etc/rrdcached.service \
-       etc/rrdcached-default-lsb
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -142,35 +140,6 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(systemdsystemunitdir)"
-DATA = $(systemdsystemunit_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -207,11 +176,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \
        $(top_srcdir)/conftools/config.sub \
        $(top_srcdir)/conftools/install-sh \
        $(top_srcdir)/conftools/ltmain.sh \
-       $(top_srcdir)/conftools/missing \
-       $(top_srcdir)/etc/rrdcached-default-lsb.in \
-       $(top_srcdir)/etc/rrdcached.service.in \
-       $(top_srcdir)/etc/rrdcached.socket.in ABOUT-NLS NEWS TODO \
-       compile config.guess config.rpath config.sub conftools/compile \
+       $(top_srcdir)/conftools/missing ABOUT-NLS NEWS TODO compile \
+       config.guess config.rpath config.sub conftools/compile \
        conftools/config.guess conftools/config.rpath \
        conftools/config.sub conftools/install-sh conftools/ltmain.sh \
        conftools/missing depcomp install-sh ltmain.sh missing
@@ -478,14 +444,6 @@ AUTOMAKE_OPTIONS = foreign
 # where we keep local rules for automake
 ACLOCAL_AMFLAGS = -I m4
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
-#AUTOCONF = @AUTOCONF@ --localdir=$(top_srcdir)/config
-
-#      $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
-@HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
-@HAVE_SYSTEMD_TRUE@    etc/rrdcached.socket \
-@HAVE_SYSTEMD_TRUE@    etc/rrdcached.service
-
 all: all-recursive
 
 .SUFFIXES:
@@ -522,12 +480,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-etc/rrdcached.socket: $(top_builddir)/config.status $(top_srcdir)/etc/rrdcached.socket.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
-etc/rrdcached.service: $(top_builddir)/config.status $(top_srcdir)/etc/rrdcached.service.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
-etc/rrdcached-default-lsb: $(top_builddir)/config.status $(top_srcdir)/etc/rrdcached-default-lsb.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
        -rm -f *.lo
@@ -537,27 +489,6 @@ clean-libtool:
 
 distclean-libtool:
        -rm -f libtool config.lt
-install-systemdsystemunitDATA: $(systemdsystemunit_DATA)
-       @$(NORMAL_INSTALL)
-       @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(systemdsystemunitdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)" || exit 1; \
-       fi; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemdsystemunitdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(systemdsystemunitdir)" || exit $$?; \
-       done
-
-uninstall-systemdsystemunitDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(systemdsystemunitdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -841,12 +772,9 @@ distcleancheck: distclean
               exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(DATA)
+all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(systemdsystemunitdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -900,7 +828,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-systemdsystemunitDATA
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -946,7 +874,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-systemdsystemunitDATA
+uninstall-am:
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
@@ -961,17 +889,23 @@ uninstall-am: uninstall-systemdsystemunitDATA
        install-data-am install-dvi install-dvi-am install-exec \
        install-exec-am install-html install-html-am install-info \
        install-info-am install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip \
-       install-systemdsystemunitDATA installcheck installcheck-am \
-       installdirs installdirs-am maintainer-clean \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic \
        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-       uninstall-am uninstall-systemdsystemunitDATA
+       uninstall-am
 
 .PRECIOUS: Makefile
 
 
  # the following files are not mentioned in any other Makefile
+#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+#AUTOCONF = @AUTOCONF@ --localdir=$(top_srcdir)/config
+
+#      $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
+
+etc-install:
+       cd etc && $(MAKE) install
 
 site-perl-inst: site-perl-install
 

diff --git a/configure b/configure
index 4ef1c297db53dc0fa85199dec4b84b5a0d518ec3..26b3ce1b6873a14931b51d1b34eea195ef871ccd 100755 (executable)
--- a/configure
+++ b/configure
@@ -25238,6 +25238,8 @@ ac_config_files="$ac_config_files tests/Makefile"
 
 ac_config_files="$ac_config_files doc/Makefile"
 
+ac_config_files="$ac_config_files etc/Makefile"
+
 ac_config_files="$ac_config_files po/Makefile.in"
 
 ac_config_files="$ac_config_files src/Makefile"
@@ -26382,6 +26384,7 @@ do
     "etc/rrdcached-default-lsb") CONFIG_FILES="$CONFIG_FILES etc/rrdcached-default-lsb" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/librrd.pc") CONFIG_FILES="$CONFIG_FILES src/librrd.pc" ;;
@@ -27817,6 +27820,7 @@ if test "$lua_need_compat51" = "1"; then
 echo "   Lua Lua-modules dir: $LUA_INSTALL_LMOD"
 fi
 fi
+echo "      Systemd unit dir: $with_systemdsystemunitdir"
 echo "    Build Tcl Bindings: $enable_tcl"
 echo " Build Python Bindings: $enable_python"
 echo "        Build examples: $enable_examples"
@@ -27833,6 +27837,10 @@ echo "             Libraries: $ALL_LIBS"
 echo
 echo "Type 'make' to compile the software and use 'make install' to "
 echo "install everything to: $prefix."
+if test "x$with_systemdsystemunitdir" != xno; then
+echo
+echo "Type 'make etc-install' to install systemd support for rrdcached"
+fi
 echo
 echo "       ... that wishlist is NO JOKE. If you find RRDtool useful"
 echo "make me happy. Go to http://tobi.oetiker.ch/wish and"

diff --git a/configure.ac b/configure.ac
index fbe7a51f55ecd10ede163633c6a2a39ea7fcd17b..6317eae7c9578e16333c2988467d93033da0a162 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -995,6 +995,7 @@ AC_CONFIG_FILES([examples/rrdcached/Makefile])
 AC_CONFIG_FILES([etc/rrdcached-default-lsb])
 AC_CONFIG_FILES([tests/Makefile])
 AC_CONFIG_FILES([doc/Makefile])
+AC_CONFIG_FILES([etc/Makefile])
 AC_CONFIG_FILES([po/Makefile.in])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/librrd.pc])
@@ -1047,6 +1048,7 @@ if test "$lua_need_compat51" = "1"; then
 echo "   Lua Lua-modules dir: $LUA_INSTALL_LMOD"
 fi
 fi
+echo "      Systemd unit dir: $with_systemdsystemunitdir"
 echo "    Build Tcl Bindings: $enable_tcl"
 echo " Build Python Bindings: $enable_python"
 echo "        Build examples: $enable_examples"
@@ -1063,6 +1065,10 @@ echo "             Libraries: $ALL_LIBS"
 echo
 echo "Type 'make' to compile the software and use 'make install' to "
 echo "install everything to: $prefix."
+if test "x$with_systemdsystemunitdir" != xno; then
+echo
+echo "Type 'make etc-install' to install systemd support for rrdcached"
+fi
 echo
 echo "       ... that wishlist is NO JOKE. If you find RRDtool useful"
 echo "make me happy. Go to http://tobi.oetiker.ch/wish and"

diff --git a/etc/Makefile.am b/etc/Makefile.am
new file mode 100644 (file)
index 0000000..f5503f0
--- /dev/null
+++ b/etc/Makefile.am
@@ -0,0 +1,5 @@
+if HAVE_SYSTEMD
+systemdsystemunit_DATA = \
+       etc/rrdcached.socket \
+       etc/rrdcached.service
+endif
\ No newline at end of file