[SSSD] [PATCHES] RHEL6 build fixes

Lukas Slebodnik lslebodn at redhat.com
Wed Jun 18 10:15:05 UTC 2014


On (17/06/14 15:09), Nikolai Kondrashov wrote:
>Hi everyone,
>
>Attached are several patches fixing RHEL6 build issues.
>
>Nick

>From a4ab4393debdec591a45736a6f563144b0088baa Mon Sep 17 00:00:00 2001
>From: Nikolai Kondrashov <Nikolai.Kondrashov at redhat.com>
>Date: Tue, 17 Jun 2014 11:59:47 +0300
>Subject: [PATCH 3/3] build: Augment systemdconfdir at configure stage
>
>Add "/sssd.service.d" to systemdconfdir at configure stage, instead of
>the make stage. This way, if systemd is not used, systemdconfdir
>variable stays empty. That in turn, works around the attempt by older
>versions of Automake to create the installation directory even though no
>files are installed there [1].
>
>This fixes installation and distcheck target on RHEL6, where an
>"/sssd.service.d" directory creation would otherwise be attempted.
>
>---
make tried to create directory "/sssd.service.d",
because variable "systemdconfdir" was not empty.
It should be empty if initscript is sysv.

Right approach should be different.

diff --git a/Makefile.am b/Makefile.am
index c256c3c8d7554948170d46871842465151bcca40..737eaba9841b443b6d85cea2860b667e5fc91022 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,7 @@ pipepath = @pipepath@
 mcpath = @mcpath@
 initdir = @initdir@
 systemdunitdir = @systemdunitdir@
-systemdconfdir = @systemdconfdir@/sssd.service.d
+systemdconfdir = @systemdconfdir@
 logpath = @logpath@
 pubconfpath = @pubconfpath@
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index af0834a7503dddc49a2ebbd21f455215cdb136f3..0cb1e6354966f9054350b48bd3f2a5ed4fced118 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -227,6 +227,9 @@ AC_DEFUN([WITH_SYSTEMD_CONF_DIR],
       AC_MSG_ERROR([Could not detect systemd config directory])
     fi
   fi
+  if test x"$systemdconfdir" != x; then
+    systemdconfdir="$systemdconfdir/sssd.service.d"
+  fi
   AC_SUBST(systemdconfdir)
   ])

or alternative version

diff --git a/Makefile.am b/Makefile.am
index c256c3c8d7554948170d46871842465151bcca40..737eaba9841b443b6d85cea2860b667e5fc91022 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,7 @@ pipepath = @pipepath@
 mcpath = @mcpath@
 initdir = @initdir@
 systemdunitdir = @systemdunitdir@
-systemdconfdir = @systemdconfdir@/sssd.service.d
+systemdconfdir = @systemdconfdir@
 logpath = @logpath@
 pubconfpath = @pubconfpath@
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index af0834a..e737cc4 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -226,6 +226,7 @@ AC_DEFUN([WITH_SYSTEMD_CONF_DIR],
     if test x"$systemdconfdir" = x; then
       AC_MSG_ERROR([Could not detect systemd config directory])
     fi
+    systemdconfdir="$systemdconfdir/sssd.service.d"
   fi
   AC_SUBST(systemdconfdir)
   ])


LS



More information about the sssd-devel mailing list