1 diff -urNp -x '*.orig' sssd-1.13.4.org/Makefile.am sssd-1.13.4/Makefile.am
2 --- sssd-1.13.4.org/Makefile.am 2021-03-03 21:59:13.565804202 +0100
3 +++ sssd-1.13.4/Makefile.am 2021-03-03 21:59:13.715851718 +0100
4 @@ -3455,7 +3455,8 @@ if WITH_JOURNALD
6 src/sysv/systemd/journal.conf
14 diff -urNp -x '*.orig' sssd-1.13.4.org/configure.ac sssd-1.13.4/configure.ac
15 --- sssd-1.13.4.org/configure.ac 2016-04-13 16:48:41.000000000 +0200
16 +++ sssd-1.13.4/configure.ac 2021-03-03 21:59:13.715851718 +0100
17 @@ -207,7 +207,7 @@ if test x$HAVE_NSCD; then
21 -if test x$initscript = xsystemd; then
22 +if test x"${initscript%systemd}" != x"${initscript}"; then
26 diff -urNp -x '*.orig' sssd-1.13.4.org/src/conf_macros.m4 sssd-1.13.4/src/conf_macros.m4
27 --- sssd-1.13.4.org/src/conf_macros.m4 2016-04-13 16:48:41.000000000 +0200
28 +++ sssd-1.13.4/src/conf_macros.m4 2021-03-03 21:59:13.715851718 +0100
29 @@ -130,14 +130,15 @@ AC_DEFUN([WITH_INITSCRIPT],
32 if test x"$with_initscript" = xsysv || \
33 - test x"$with_initscript" = xsystemd; then
34 + test x"$with_initscript" = xsystemd || \
35 + test x"$with_initscript" = xsysv,systemd; then
36 initscript=$with_initscript
38 AC_MSG_ERROR([Illegal value -$with_initscript- for option --with-initscript])
41 - AM_CONDITIONAL([HAVE_SYSV], [test x"$initscript" = xsysv])
42 - AM_CONDITIONAL([HAVE_SYSTEMD_UNIT], [test x"$initscript" = xsystemd])
43 + AM_CONDITIONAL([HAVE_SYSV], [test x"${initscript#sysv}" != "x${initscript}"])
44 + AM_CONDITIONAL([HAVE_SYSTEMD_UNIT], [test x"${initscript%systemd}" != x"${initscript}"])
45 AC_MSG_NOTICE([Will use init script type: $initscript])