summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Koegel <eric.koegel@gmail.com>2014-10-19 15:17:23 +0300
committerEric Koegel <eric.koegel@gmail.com>2014-10-19 15:17:23 +0300
commit856b0ece700915bf989a6663fdddb89559cba820 (patch)
tree85903f778caeed3499c48efec521efa2b7b19016
parent300a86cd61a5a1d1b9610a97b4c009dc632d36b9 (diff)
downloadConsoleKit2-856b0ece700915bf989a6663fdddb89559cba820.tar.gz
Add --with-logrotate-dir configure option
We now install the logrotate file and default to /etc/logrotate.d as the default to install to.
-rw-r--r--configure.ac14
-rw-r--r--data/Makefile.am5
2 files changed, 18 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index e91b8e3..170b343 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,6 +287,19 @@ fi
AC_SUBST(PAM_MODULE_DIR)
dnl ---------------------------------------------------------------------------
+dnl - Install directory for syslog rotation file
+dnl ---------------------------------------------------------------------------
+
+AC_ARG_WITH(logrotate-dir,
+ [AS_HELP_STRING([--with-logrotate-dir=<dir>],[directory to install syslog rotation file])])
+if ! test -z "$with_logrotate_dir"; then
+ LOGROTATE_DIR="$with_logrotate_dir"
+else
+ LOGROTATE_DIR="/etc/logrotate.d"
+fi
+AC_SUBST(LOGROTATE_DIR)
+
+dnl ---------------------------------------------------------------------------
dnl - DocBook Documentation
dnl ---------------------------------------------------------------------------
@@ -500,6 +513,7 @@ echo "
Build PAM module: ${msg_pam_module}
Build udev-acl: ${enable_udev_acl}
Build docs: ${enable_docbook_docs}
+ Log rotate dir: ${LOGROTATE_DIR}
PolicyKit support ${have_polkit}
RBAC (Solaris) support: ${msg_rbac_shutdown}
diff --git a/data/Makefile.am b/data/Makefile.am
index fd51f9d..c736c61 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,6 +6,9 @@ dbusconf_DATA = ConsoleKit.conf
seatdir = $(sysconfdir)/ConsoleKit/seats.d
seat_DATA = 00-primary.seat
+logrotatedir = $(LOGROTATE_DIR)
+logrotate_DATA = consolekit.logrotate
+
if HAVE_POLKIT
polkit_policydir = $(datadir)/polkit-1/actions
dist_polkit_policy_DATA = \
@@ -75,13 +78,13 @@ EXTRA_DIST = \
ck-log-system-stop \
$(dbusconf_DATA) \
$(seat_DATA) \
+ $(logrotate_DATA) \
$(service_in_files) \
console-kit-daemon.service.in \
console-kit-log-system-start.service.in \
console-kit-log-system-stop.service.in \
console-kit-log-system-restart.service.in \
90consolekit \
- consolekit.logrotate \
$(NULL)
MAINTAINERCLEANFILES = \