initscript: fix

not use AC_ARG_ENABLE

diff --git a/configure.ac b/configure.ac
index 09bc9e58b3162f4c85104652bccbde06d8a26640..c38a13ca7b6ba04652e5aadecdf2a1ff7e075356 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -235,91 +235,6 @@ AC_NETATALK_REALPATH
 dnl Check for sendfile()
 AC_NETATALK_SENDFILE
 
-AC_ARG_ENABLE(redhat,
-       [  --enable-redhat         obsoleted ],[
-       echo "ERROR: --enable-redhat is obsoleted. Use --enable-redhat-sysv or --enable-redhat-systemd."
-       exit 1
-       ]
-)
-
-AC_ARG_ENABLE(redhat-sysv,
-       [  --enable-redhat-sysv    use redhat-style sysv (upstart) configuration ],[
-       if test "$enableval" = "yes"; then
-               sysv_style=redhat-sysv
-       fi
-       AC_MSG_RESULT([enabling redhat-style sysv support])
-       ]
-)
-
-AC_ARG_ENABLE(redhat-systemd,
-       [  --enable-redhat-systemd use redhat-style systemd (>=Fedora15) configuration ],[
-       if test "$enableval" = "yes"; then
-               sysv_style=redhat-systemd
-       fi
-       AC_MSG_RESULT([enabling redhat-style systemd support])
-       ]
-)
-
-AC_ARG_ENABLE(suse,
-       [  --enable-suse           obsoleted ],[
-       echo "ERROR: --enable-suse is obsoleted. Use --enable-suse-sysv or --enable-suse-systemd."
-       exit 1
-       ]
-)
-
-AC_ARG_ENABLE(suse-sysv,
-       [  --enable-suse-sysv      use suse-style sysv configuration ],[
-       if test "$enableval" = "yes"; then
-               sysv_style=suse-sysv
-       fi
-       AC_MSG_RESULT([enabling suse-style sysv support])
-       ]
-)
-
-AC_ARG_ENABLE(suse-systemd,
-       [  --enable-suse-systemd   use suse-style systemd (>=openSUSE12.1) configuration ],[
-       if test "$enableval" = "yes"; then
-               sysv_style=suse-systemd
-       fi
-       AC_MSG_RESULT([enabling suse-style systemd support])
-       ]
-)
-
-AC_ARG_ENABLE(gentoo,
-       [  --enable-gentoo         use gentoo-style sysv configuration ],[
-       if test "$enableval" = "yes"; then
-               sysv_style=gentoo
-       fi
-       AC_MSG_RESULT([enabling gentoo-style sysv support])
-       ]
-)
-
-AC_ARG_ENABLE(netbsd,
-       [  --enable-netbsd         use NetBSD-style rc.d configuration ],
-       if test "x$enableval" = "xyes"; then
-               sysv_style=netbsd
-       fi
-       AC_MSG_RESULT([enabling NetBSD-style rc.d support])
-)
-
-AC_ARG_ENABLE(debian,
-       [  --enable-debian         use debian-style sysv configuration ],[
-       if test "$enableval" = "yes"; then
-               sysv_style=debian
-       fi
-       AC_MSG_RESULT([enabling debian-style sysv support])
-       ]
-)
-
-AC_ARG_ENABLE(systemd,
-       [  --enable-systemd        use general systemd configuration],[
-       if test "$enableval" = "yes"; then
-               sysv_style=systemd
-       fi
-       AC_MSG_RESULT([enabling general systemd support])
-       ]
-)
-
 dnl --------------------------------------------------------------------------
 dnl FHS stuff has to be done last because it overrides other defaults
 dnl --------------------------------------------------------------------------
@@ -386,17 +301,6 @@ AM_CONDITIONAL(DEFAULT_HOOK, test x$neta_cv_have_libgcrypt != xyes && test x$net
 AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes)
 AM_CONDITIONAL(HAVE_ATFUNCS, test x"$ac_neta_haveatfuncs" = x"yes")
 
-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_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 = x)
-
-
 dnl --------------------- generate files
 
 AC_OUTPUT([Makefile

diff --git a/distrib/initscripts/.gitignore b/distrib/initscripts/.gitignore
index 9f2a0e01d372c17f91f407b2d56f1a4ff9c3a278..328b50869042b6b7232a55079670a3c0af29ff5f 100644 (file)
--- a/distrib/initscripts/.gitignore
+++ b/distrib/initscripts/.gitignore
@@ -2,14 +2,12 @@ Makefile
 Makefile.in
 rc.atalk.bsd
 rc.atalk.redhat-sysv
-rc.atalk.systemd
 rc.atalk.suse-sysv
 rc.atalk.tru64
 rc.atalk.sysv
 service.atalk.systemd
 service.atalk-cnid.systemd
 netatalk
-atalk
 netatalk.service
 netatalk-cnid.service 
 .gitignore

diff --git a/distrib/initscripts/Makefile.am b/distrib/initscripts/Makefile.am
index 621c7085f1148614549e38b0ee961b8c614ed04b..becfbbd3a7ab58c51c0a49c5622edd3e93c987dc 100644 (file)
--- a/distrib/initscripts/Makefile.am
+++ b/distrib/initscripts/Makefile.am
@@ -92,7 +92,8 @@ install-data-hook:
 
 uninstall-startup:
        -systemctl disable $(service_DATA)
-       rm -f $(DESTDIR)$(servicedir)/$(service_DATA)
+       rm -f $(DESTDIR)$(servicedir)/netatalk.service
+       rm -f $(DESTDIR)$(servicedir)/netatalk-cnid.service
        -systemctl daemon-reload
 
 endif

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 9237affeb39cdf82e4f76c70836446b3b4cd955e..2d8aac6993ff0b68fba4e4b167dda83077abd7bf 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -150,7 +150,7 @@ AC_DEFUN([AC_NETATALK_SYSV_STYLE], [
     )
     case "$sysv_style" in 
     "redhat")
-           AC_MSG_ERROR([--enable-redhat is obsoleted. Use --enable-redhat-sysv or --enable-redhat-systemd.])
+           AC_MSG_ERROR([--with-sysv-style=redhat is obsoleted. Use redhat-sysv or redhat-systemd.])
         ;;
     "redhat-sysv")
            AC_MSG_RESULT([enabling redhat-style sysv (upstart) configuration])
@@ -159,7 +159,7 @@ AC_DEFUN([AC_NETATALK_SYSV_STYLE], [
            AC_MSG_RESULT([enabling redhat-style systemd support])
            ;;
     "suse")
-           AC_MSG_RESULT([--enable-suse is obsoleted. Use --enable-suse-sysv or --enable-suse-systemd])
+           AC_MSG_ERROR([--with-sysv-style=suse is obsoleted. Use suse-sysv or suse-systemd])
         ;;
     "suse-sysv")
            AC_MSG_RESULT([enabling suse-style sysv configuration])