From cc7d5d2543c91fe2461a7bd482bf8969638e89b9 Mon Sep 17 00:00:00 2001 From: HAT Date: Sat, 23 Mar 2013 00:12:15 +0900 Subject: [PATCH] new configure option --with-init-dir=PATH --- NEWS | 1 + distrib/initscripts/Makefile.am | 14 +++++++------- macros/netatalk.m4 | 18 +++++++++++++++++- macros/summary.m4 | 3 +++ 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 3f7c312c..0828927a 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,7 @@ Changes in 3.0.3 system security configuration files. New option 'afpstats' (default: no) which determines whether to enable the feature or not. +* NEW: configure option --with-init-dir * NEW: dtrace probes, cf include/atalk/afp_dtrace.d for available probes. * UPD: Reload groups when reloading volumes. FR #71. diff --git a/distrib/initscripts/Makefile.am b/distrib/initscripts/Makefile.am index 2d1cb3ab..79dcfb3f 100644 --- a/distrib/initscripts/Makefile.am +++ b/distrib/initscripts/Makefile.am @@ -54,7 +54,7 @@ uninstall: uninstall-startup if USE_REDHAT_SYSV -sysvdir = /etc/rc.d/init.d +sysvdir = $(INIT_DIR) sysv_SCRIPTS = netatalk $(sysv_SCRIPTS): rc.redhat @@ -76,7 +76,7 @@ endif if USE_SYSTEMD -servicedir = /lib/systemd/system +servicedir = $(INIT_DIR) service_DATA = netatalk.service netatalk.service: service.systemd @@ -98,7 +98,7 @@ endif if USE_SUSE_SYSV -sysvdir = /etc/init.d +sysvdir = $(INIT_DIR) sysv_SCRIPTS = netatalk $(sysv_SCRIPTS): rc.suse @@ -120,7 +120,7 @@ endif if USE_NETBSD -sysvdir = /etc/rc.d +sysvdir = $(INIT_DIR) sysv_SCRIPTS = netatalk netatalk: rc.netbsd @@ -141,7 +141,7 @@ endif if USE_SOLARIS -servicedir = /lib/svc/manifest/network/ +servicedir = $(INIT_DIR) service_DATA = netatalk.xml install-data-hook: @@ -158,7 +158,7 @@ endif if USE_GENTOO -sysvdir = /etc/init.d +sysvdir = $(INIT_DIR) sysv_SCRIPTS = netatalk $(sysv_SCRIPTS): rc.gentoo @@ -180,7 +180,7 @@ endif if USE_DEBIAN -sysvdir = /etc/init.d +sysvdir = $(INIT_DIR) sysv_SCRIPTS = netatalk $(sysv_SCRIPTS): rc.debian diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index 3d4576e6..beceeef9 100644 --- a/macros/netatalk.m4 +++ b/macros/netatalk.m4 @@ -355,7 +355,7 @@ AC_ARG_ENABLE(shell-check, ) ]) -dnl Check for optional sysv initscript install +dnl Check for optional initscript install AC_DEFUN([AC_NETATALK_INIT_STYLE], [ AC_ARG_WITH(init-style, [ --with-init-style use OS specific init config [[redhat-sysv|redhat-systemd|suse-sysv|suse-systemd|gentoo|netbsd|debian|solaris|systemd]]], @@ -367,36 +367,46 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [ ;; "redhat-sysv") AC_MSG_RESULT([enabling redhat-style sysv initscript support]) + ac_cv_init_dir="/etc/rc.d/init.d" ;; "redhat-systemd") AC_MSG_RESULT([enabling redhat-style systemd support]) + ac_cv_init_dir="/lib/systemd/system" ;; "suse") AC_MSG_ERROR([--with-init-style=suse is obsoleted. Use suse-sysv or suse-systemd.]) ;; "suse-sysv") AC_MSG_RESULT([enabling suse-style sysv initscript support]) + ac_cv_init_dir="/etc/init.d" ;; "suse-systemd") AC_MSG_RESULT([enabling suse-style systemd support (>=openSUSE12.1)]) + ac_cv_init_dir="/lib/systemd/system" ;; "gentoo") AC_MSG_RESULT([enabling gentoo-style initscript support]) + ac_cv_init_dir="/etc/init.d" ;; "netbsd") AC_MSG_RESULT([enabling netbsd-style initscript support]) + ac_cv_init_dir="/etc/rc.d" ;; "debian") AC_MSG_RESULT([enabling debian-style initscript support]) + ac_cv_init_dir="/etc/init.d" ;; "solaris") AC_MSG_RESULT([enabling solaris-style SMF support]) + ac_cv_init_dir="/lib/svc/manifest/network/" ;; "systemd") AC_MSG_RESULT([enabling general systemd support]) + ac_cv_init_dir="/lib/systemd/system" ;; "none") AC_MSG_RESULT([disabling init-style support]) + ac_cv_init_dir="none" ;; *) AC_MSG_ERROR([illegal init-style]) @@ -411,6 +421,12 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [ AM_CONDITIONAL(USE_SYSTEMD, test x$init_style = xsystemd || test x$init_style = xredhat-systemd || test x$init_style = xsuse-systemd) AM_CONDITIONAL(USE_UNDEF, test x$init_style = xnone) + AC_ARG_WITH(init-dir, + [ --with-init-dir=PATH path to OS specific init directory], + ac_cv_init_dir="$withval", ac_cv_init_dir="$ac_cv_init_dir" + ) + INIT_DIR="$ac_cv_init_dir" + AC_SUBST(INIT_DIR, ["$ac_cv_init_dir"]) ]) dnl OS specific configuration diff --git a/macros/summary.m4 b/macros/summary.m4 index 7f5e6499..b8db2579 100644 --- a/macros/summary.m4 +++ b/macros/summary.m4 @@ -57,6 +57,9 @@ dnl AC_MSG_RESULT([ Samba sharemode interop: $neta_cv_have_smbshmd]) AC_MSG_RESULT([ dtrace probes: $WDTRACE]) AC_MSG_RESULT([ Paths:]) AC_MSG_RESULT([ Netatalk lockfile: $ac_cv_netatalk_lock]) + if test "x$init_style" != x"none"; then + AC_MSG_RESULT([ init directory: $ac_cv_init_dir]) + fi if test x"$atalk_cv_with_dbus" = x"yes"; then AC_MSG_RESULT([ dbus system directory: $ac_cv_dbus_sysdir]) fi -- 2.39.2