From 6b67b3bd49b826e572a1d136f8da48f947a79313 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Fri, 21 Nov 2014 15:22:24 +0100
Subject: [PATCH 108/112] Fix KRB5_CONF_PATH

Currently a shell/Makefile variable is used in the definition of
KRB5_CONF_PATH for C code. This patch replaces it with a complier macro.

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
---
 Makefile.am                 | 1 +
 src/conf_macros.m4          | 2 +-
 src/tests/cwrap/Makefile.am | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 53ace65b9a9647ffdaff0776d5a55d3e7393a38c..56a562c761d39ff5f54bc034ede563c40bf21ef8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -386,6 +386,7 @@ AM_CPPFLAGS = \
     $(JOURNALD_CFLAGS) \
     -DLIBDIR=\"$(libdir)\" \
     -DVARDIR=\"$(localstatedir)\" \
+    -DSYSCONFDIR=\"$(sysconfdir)\" \
     -DSHLIBEXT=\"$(SHLIBEXT)\" \
     -DSSSD_LIBEXEC_PATH=\"$(sssdlibexecdir)\" \
     -DSSSD_CONF_DIR=\"$(sssdconfdir)\" \
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index fbee81f56e484b618379f7c987ecee50ae48917e..df9d1ddf89be38709e56ad4b214e5f7c6cbb0f97 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -353,7 +353,7 @@ AC_DEFUN([WITH_KRB5_CONF],
                 ]
                )
 
-    KRB5_CONF_PATH="${sysconfdir}/krb5.conf"
+    KRB5_CONF_PATH="\"SYSCONFDIR\"/krb5.conf"
     if test x"$with_krb5_conf" != x; then
         KRB5_CONF_PATH=$with_krb5_conf
     fi
diff --git a/src/tests/cwrap/Makefile.am b/src/tests/cwrap/Makefile.am
index 02be67387110c0a440b647c35bba0c10e89e699d..46abab5ae32189b0561d1901407d2bb38a1ec4c0 100644
--- a/src/tests/cwrap/Makefile.am
+++ b/src/tests/cwrap/Makefile.am
@@ -4,7 +4,9 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/src \
     -I. \
     -DLOCALEDIR=\"$(localedir)\" \
+    -DLIBDIR=\"$(libdir)\" \
     -DVARDIR=\"$(localstatedir)\" \
+    -DSYSCONFDIR=\"$(sysconfdir)\" \
     $(DBUS_CFLAGS) \
     $(GLIB2_CFLAGS) \
     $(NULL)
-- 
1.9.3