From 800ad2164da5c4f2699702072f9454203c5f4d7e Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Jan 26 2019 12:42:03 +0000
Subject: DIST: Do not use conditional include for template files


We do not use AC_CONFIG_FILES in configure.ac for replacing some values
at configure time because we need to replace them at build time in make.

And because such files are not listed in AC_CONFIG_FILES we need to have
them in the automake variable EXTRA_DIST. And they must not be included
conditionally. We want to have always in dist tarball besides. It must
not depend on the configuration of system which was used for generating
tarball

The automake documentation says:
  Still, sometimes there are files which must be distributed, but which
  are not covered in the automatic rules. These files should be listed
  in the EXTRA_DIST variable.

Merges: https://pagure.io/SSSD/sssd/pull-request/3929

---

diff --git a/Makefile.am b/Makefile.am
index 4305060..aa2eb2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5004,43 +5004,18 @@ EXTRA_DIST += \
     src/sysv/systemd/sssd-pam.service.in \
     src/sysv/systemd/sssd-secrets.socket.in \
     src/sysv/systemd/sssd-secrets.service.in \
-    $(NULL)
-
-if BUILD_AUTOFS
-EXTRA_DIST += \
     src/sysv/systemd/sssd-autofs.socket.in \
     src/sysv/systemd/sssd-autofs.service.in \
-    $(NULL)
-endif
-if BUILD_IFP
-EXTRA_DIST += \
     src/sysv/systemd/sssd-ifp.service.in \
-    $(NULL)
-endif
-if BUILD_PAC_RESPONDER
-EXTRA_DIST += \
     src/sysv/systemd/sssd-pac.socket.in \
     src/sysv/systemd/sssd-pac.service.in \
-    $(NULL)
-endif
-if BUILD_SSH
-EXTRA_DIST += \
     src/sysv/systemd/sssd-ssh.socket.in \
     src/sysv/systemd/sssd-ssh.service.in \
-    $(NULL)
-endif
-if BUILD_SUDO
-EXTRA_DIST += \
     src/sysv/systemd/sssd-sudo.socket.in \
     src/sysv/systemd/sssd-sudo.service.in \
-    $(NULL)
-endif
-if BUILD_KCM
-EXTRA_DIST += \
     src/sysv/systemd/sssd-kcm.socket.in \
     src/sysv/systemd/sssd-kcm.service.in \
     $(NULL)
-endif
 
 src/sysv/systemd/sssd.service: src/sysv/systemd/sssd.service.in Makefile
 	@$(MKDIR_P) src/sysv/systemd/