From d92a5752b7a8fd29b8152263e751c499ba22e2bf Mon Sep 17 00:00:00 2001 From: HAT Date: Tue, 29 Nov 2011 02:51:28 +0900 Subject: [PATCH] new configure option "--enable-suse-systemd" for openSUSE12.1 and later. "--enable-suse" is renamed "--enable-suse-sysv". --- NEWS | 4 +++ configure.ac | 34 ++++++++++++++++--- distrib/initscripts/.gitignore | 6 ++-- distrib/initscripts/Makefile.am | 30 ++++++++-------- ...talk.suse.tmpl => rc.atalk.suse-sysv.tmpl} | 0 ...hat-systemd.tmpl => rc.atalk.systemd.tmpl} | 0 ...ystemd.tmpl => service.atalk.systemd.tmpl} | 0 7 files changed, 51 insertions(+), 23 deletions(-) rename distrib/initscripts/{rc.atalk.suse.tmpl => rc.atalk.suse-sysv.tmpl} (100%) rename distrib/initscripts/{rc.atalk.redhat-systemd.tmpl => rc.atalk.systemd.tmpl} (100%) rename distrib/initscripts/{service.atalk.redhat-systemd.tmpl => service.atalk.systemd.tmpl} (100%) diff --git a/NEWS b/NEWS index a56a1946..8cdd6881 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,10 @@ Changes in 2.2.2 created for the original connecting user. Said differently: if you know the password of adminauthuser, you can authenticate as any other user. +* NEW: configure option "--enable-suse-systemd" for openSUSE12.1 and later. + "--enable-redhat-systemd" and "--enable-suse-systemd" are same as + "--enable-systemd". + "--enable-suse" is renamed "--enable-suse-sysv". * NEW: experimental systemd service files in distrib/systemd/ * UPD: afpd: Enhanced POSIX ACL mapping semantics, from Laura Mueller * UPD: afpd: Reset options every time a :DEFAULT: line is found in a diff --git a/configure.ac b/configure.ac index 41d2cc83..d4caed44 100644 --- a/configure.ac +++ b/configure.ac @@ -393,7 +393,6 @@ AC_ARG_ENABLE(locking, AC_ARG_ENABLE(redhat, [ --enable-redhat obsoleted ],[ echo "ERROR: --enable-redhat is obsoleted. Use --enable-redhat-sysv or --enable-redhat-systemd." - echo "exit 1" exit 1 ] ) @@ -417,14 +416,30 @@ AC_ARG_ENABLE(redhat-systemd, ) AC_ARG_ENABLE(suse, - [ --enable-suse use suse-style sysv configuration ],[ + [ --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_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 @@ -451,6 +466,15 @@ AC_ARG_ENABLE(debian, ] ) +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 ----- timelord compilation (disabled by default) AC_MSG_CHECKING([whether timelord should be compiled]) compile_timelord=no @@ -1274,13 +1298,13 @@ AM_CONDITIONAL(USE_PGP, test x$compile_pgp = xyes) AM_CONDITIONAL(DEFAULT_HOOK, test x$neta_cv_have_libgcrypt != xyes && test x$neta_cv_have_openssl != xyes) AM_CONDITIONAL(USE_NETBSD, test x$sysv_style = xnetbsd) AM_CONDITIONAL(USE_REDHAT_SYSV, test x$sysv_style = xredhat-sysv) -AM_CONDITIONAL(USE_REDHAT_SYSTEMD, test x$sysv_style = xredhat-systemd) -AM_CONDITIONAL(USE_SUSE, test x$sysv_style = xsuse) +AM_CONDITIONAL(USE_SUSE_SYSV, test x$sysv_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 = x) AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes) AM_CONDITIONAL(USE_APPLETALK, test x$netatalk_cv_ddp_enabled = xyes) diff --git a/distrib/initscripts/.gitignore b/distrib/initscripts/.gitignore index 150a1198..8600d948 100644 --- a/distrib/initscripts/.gitignore +++ b/distrib/initscripts/.gitignore @@ -2,11 +2,11 @@ Makefile Makefile.in rc.atalk.bsd rc.atalk.redhat-sysv -rc.atalk.redhat-systemd -rc.atalk.suse +rc.atalk.systemd +rc.atalk.suse-sysv rc.atalk.tru64 rc.atalk.sysv -service.atalk.redhat-systemd +service.atalk.systemd netatalk atalk netatalk.service diff --git a/distrib/initscripts/Makefile.am b/distrib/initscripts/Makefile.am index 5d73af0b..360dfccd 100644 --- a/distrib/initscripts/Makefile.am +++ b/distrib/initscripts/Makefile.am @@ -19,34 +19,34 @@ pkgconfdir = @PKGCONFDIR@ GENERATED_FILES = \ rc.afpd.netbsd \ rc.atalk.redhat-sysv \ - rc.atalk.redhat-systemd \ + rc.atalk.systemd \ rc.atalk.tru64 \ rc.atalk.bsd \ rc.atalkd.netbsd \ - rc.atalk.suse \ + rc.atalk.suse-sysv \ rc.cnid_metad.netbsd \ rc.papd.netbsd \ rc.timelord.netbsd \ rc.atalk.sysv \ rc.atalk.gentoo \ rc.atalk.debian \ - service.atalk.redhat-systemd + service.atalk.systemd TEMPLATES = \ rc.afpd.netbsd.tmpl \ rc.atalk.redhat-sysv.tmpl \ - rc.atalk.redhat-systemd.tmpl \ + rc.atalk.systemd.tmpl \ rc.atalk.tru64.tmpl \ rc.atalk.bsd.tmpl \ rc.atalkd.netbsd.tmpl \ - rc.atalk.suse.tmpl \ + rc.atalk.suse-sysv.tmpl \ rc.cnid_metad.netbsd.tmpl \ rc.papd.netbsd.tmpl \ rc.timelord.netbsd.tmpl \ rc.atalk.sysv.tmpl \ rc.atalk.gentoo.tmpl \ rc.atalk.debian.tmpl \ - service.atalk.redhat-systemd.tmpl + service.atalk.systemd.tmpl CLEANFILES = $(GENERATED_FILES) $(sysv_SCRIPTS) $(service_DATA) afpd atalkd cnid_metad papd timelord EXTRA_DIST = $(TEMPLATES) @@ -80,10 +80,10 @@ uninstall-startup: endif # -# checking for "redhat" style systemd scripts: +# checking for general systemd scripts: # -if USE_REDHAT_SYSTEMD +if USE_SYSTEMD sysvdir = $(pkglibexecdir) sysv_SCRIPTS = netatalk.sh @@ -91,12 +91,12 @@ sysv_SCRIPTS = netatalk.sh servicedir = /lib/systemd/system service_DATA = netatalk.service -$(sysv_SCRIPTS): rc.atalk.redhat-systemd - cp -f rc.atalk.redhat-systemd $(sysv_SCRIPTS) +$(sysv_SCRIPTS): rc.atalk.systemd + cp -f rc.atalk.systemd $(sysv_SCRIPTS) chmod a+x $(sysv_SCRIPTS) -$(service_DATA): service.atalk.redhat-systemd - cp -f service.atalk.redhat-systemd $(service_DATA) +$(service_DATA): service.atalk.systemd + cp -f service.atalk.systemd $(service_DATA) install-data-hook: -systemctl daemon-reload @@ -113,13 +113,13 @@ endif # checking for "SuSE" style sysv scripts: # -if USE_SUSE +if USE_SUSE_SYSV sysvdir = /etc/init.d sysv_SCRIPTS = netatalk -$(sysv_SCRIPTS): rc.atalk.suse - cp -f rc.atalk.suse $(sysv_SCRIPTS) +$(sysv_SCRIPTS): rc.atalk.suse-sysv + cp -f rc.atalk.suse-sysv $(sysv_SCRIPTS) chmod a+x $(sysv_SCRIPTS) install-data-hook: diff --git a/distrib/initscripts/rc.atalk.suse.tmpl b/distrib/initscripts/rc.atalk.suse-sysv.tmpl similarity index 100% rename from distrib/initscripts/rc.atalk.suse.tmpl rename to distrib/initscripts/rc.atalk.suse-sysv.tmpl diff --git a/distrib/initscripts/rc.atalk.redhat-systemd.tmpl b/distrib/initscripts/rc.atalk.systemd.tmpl similarity index 100% rename from distrib/initscripts/rc.atalk.redhat-systemd.tmpl rename to distrib/initscripts/rc.atalk.systemd.tmpl diff --git a/distrib/initscripts/service.atalk.redhat-systemd.tmpl b/distrib/initscripts/service.atalk.systemd.tmpl similarity index 100% rename from distrib/initscripts/service.atalk.redhat-systemd.tmpl rename to distrib/initscripts/service.atalk.systemd.tmpl -- 2.39.2