replace "sysv-style" with "init-style"

diff --git a/configure.ac b/configure.ac
index 6dac0a9a2bb46a527b8b22d0d50dd8171c4a3e6d..7ab53637e81de8cfa58162ae92c4354107e8fcbc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -137,7 +137,7 @@ dnl Check for optional valid-shell-check support
 AC_NETATALK_SHELL_CHECK
 
 dnl Check for optional sysv initscript install
-AC_NETATALK_SYSV_STYLE
+AC_NETATALK_INIT_STYLE
 
 dnl Path where UAM modules shall be installed
 AC_ARG_WITH(uams-path, [  --with-uams-path=PATH   path to UAMs [[$libdir/netatalk/]]], [uams_path="$withval/"], [uams_path="$libdir/netatalk/"])

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 5b5f13687f35a2fcc7f4fb4d1ece5af97551a391..1b0f4944b1e43684d5816ae62217fc872058668d 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -204,14 +204,14 @@ AC_ARG_ENABLE(shell-check,
 ])
 
 dnl Check for optional sysv initscript install
-AC_DEFUN([AC_NETATALK_SYSV_STYLE], [
-    AC_ARG_WITH(sysv-style,
-                [  --with-sysv-style       use OS specific sysv config [[redhat-sysv|redhat-systemd|suse-sysv|suse-systemd|gentoo|netbsd|debian|systemd]]],
-                sysv_style="$withval", sysv_style=none
+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|systemd]]],
+                init_style="$withval", init_style=none
     )
-    case "$sysv_style" in 
+    case "$init_style" in 
     "redhat")
-           AC_MSG_ERROR([--with-sysv-style=redhat is obsoleted. Use redhat-sysv or redhat-systemd.])
+           AC_MSG_ERROR([--with-init-style=redhat is obsoleted. Use redhat-sysv or redhat-systemd.])
         ;;
     "redhat-sysv")
            AC_MSG_RESULT([enabling redhat-style sysv (upstart) configuration])
@@ -220,7 +220,7 @@ AC_DEFUN([AC_NETATALK_SYSV_STYLE], [
            AC_MSG_RESULT([enabling redhat-style systemd support])
            ;;
     "suse")
-           AC_MSG_ERROR([--with-sysv-style=suse is obsoleted. Use suse-sysv or suse-systemd])
+           AC_MSG_ERROR([--with-init-style=suse is obsoleted. Use suse-sysv or suse-systemd.])
         ;;
     "suse-sysv")
            AC_MSG_RESULT([enabling suse-style sysv configuration])
@@ -244,16 +244,16 @@ AC_DEFUN([AC_NETATALK_SYSV_STYLE], [
            AC_MSG_RESULT([disabling sysv support])
         ;;
     esac
-    AM_CONDITIONAL(USE_NETBSD, test x$sysv_style = xnetbsd)
-    AM_CONDITIONAL(USE_REDHAT_SYSV, test x$sysv_style = xredhat-sysv)
-    AM_CONDITIONAL(USE_SUSE_SYSV, test x$sysv_style = xsuse-sysv)
+    AM_CONDITIONAL(USE_NETBSD, test x$init_style = xnetbsd)
+    AM_CONDITIONAL(USE_REDHAT_SYSV, test x$init_style = xredhat-sysv)
+    AM_CONDITIONAL(USE_SUSE_SYSV, test x$init_style = xsuse-sysv)
     AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes)
-    AM_CONDITIONAL(USE_TRU64, test x$sysv_style = xtru64)
-    AM_CONDITIONAL(USE_SOLARIS, test x$sysv_style = xsolaris)
-    AM_CONDITIONAL(USE_GENTOO, test x$sysv_style = xgentoo)
-    AM_CONDITIONAL(USE_DEBIAN, test x$sysv_style = xdebian)
-    AM_CONDITIONAL(USE_SYSTEMD, test x$sysv_style = xsystemd || test x$sysv_style = xredhat-systemd || test x$sysv_style = xsuse-systemd)
-    AM_CONDITIONAL(USE_UNDEF, test x$sysv_style = xnone)
+    AM_CONDITIONAL(USE_TRU64, test x$init_style = xtru64)
+    AM_CONDITIONAL(USE_SOLARIS, test x$init_style = xsolaris)
+    AM_CONDITIONAL(USE_GENTOO, test x$init_style = xgentoo)
+    AM_CONDITIONAL(USE_DEBIAN, test x$init_style = xdebian)
+    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)
 
 ])
 
@@ -358,7 +358,7 @@ if test x"$this_os" = "xsolaris"; then
     AC_DEFINE(__EXTENSIONS__,  1, [Solaris compilation environment])
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
        need_dash_r=yes
-       sysv_style=solaris
+       init_style=solaris
 
        solaris_module=no
        AC_MSG_CHECKING([if we can build Solaris kernel module])

diff --git a/macros/summary.m4 b/macros/summary.m4
index d5832cf450f2966f75fd0f66ecbe31b212d59f45..0f155737bfde981a5ef6bc240ee9075c91712eeb 100644 (file)
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -1,12 +1,11 @@
-dnl $Id: summary.m4,v 1.6 2009-10-02 09:32:41 franklahm Exp $
 dnl Autoconf macros, display configure summary
 
 AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
 
        AC_MSG_RESULT([Configure summary:])
-       AC_MSG_RESULT([    Install style:])
-       if test "x$sysv_style" != "x"; then
-               AC_MSG_RESULT([         $sysv_style])
+       AC_MSG_RESULT([       init style:])
+       if test "x$init_style" != "x"; then
+               AC_MSG_RESULT([         $init_style])
        else
                AC_MSG_RESULT([         none])
        fi