|
 |
905b4d |
From 6b67b3bd49b826e572a1d136f8da48f947a79313 Mon Sep 17 00:00:00 2001
|
|
|
905b4d |
From: Sumit Bose <sbose@redhat.com>
|
|
|
905b4d |
Date: Fri, 21 Nov 2014 15:22:24 +0100
|
|
|
905b4d |
Subject: [PATCH 108/112] Fix KRB5_CONF_PATH
|
|
|
905b4d |
|
|
|
905b4d |
Currently a shell/Makefile variable is used in the definition of
|
|
|
905b4d |
KRB5_CONF_PATH for C code. This patch replaces it with a complier macro.
|
|
|
905b4d |
|
|
|
905b4d |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
905b4d |
---
|
|
|
905b4d |
Makefile.am | 1 +
|
|
|
905b4d |
src/conf_macros.m4 | 2 +-
|
|
|
905b4d |
src/tests/cwrap/Makefile.am | 2 ++
|
|
|
905b4d |
3 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
905b4d |
|
|
|
905b4d |
diff --git a/Makefile.am b/Makefile.am
|
|
|
905b4d |
index 53ace65b9a9647ffdaff0776d5a55d3e7393a38c..56a562c761d39ff5f54bc034ede563c40bf21ef8 100644
|
|
|
905b4d |
--- a/Makefile.am
|
|
|
905b4d |
+++ b/Makefile.am
|
|
|
905b4d |
@@ -386,6 +386,7 @@ AM_CPPFLAGS = \
|
|
|
905b4d |
$(JOURNALD_CFLAGS) \
|
|
|
905b4d |
-DLIBDIR=\"$(libdir)\" \
|
|
|
905b4d |
-DVARDIR=\"$(localstatedir)\" \
|
|
|
905b4d |
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
|
|
|
905b4d |
-DSHLIBEXT=\"$(SHLIBEXT)\" \
|
|
|
905b4d |
-DSSSD_LIBEXEC_PATH=\"$(sssdlibexecdir)\" \
|
|
|
905b4d |
-DSSSD_CONF_DIR=\"$(sssdconfdir)\" \
|
|
|
905b4d |
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
|
|
|
905b4d |
index fbee81f56e484b618379f7c987ecee50ae48917e..df9d1ddf89be38709e56ad4b214e5f7c6cbb0f97 100644
|
|
|
905b4d |
--- a/src/conf_macros.m4
|
|
|
905b4d |
+++ b/src/conf_macros.m4
|
|
|
905b4d |
@@ -353,7 +353,7 @@ AC_DEFUN([WITH_KRB5_CONF],
|
|
|
905b4d |
]
|
|
|
905b4d |
)
|
|
|
905b4d |
|
|
|
905b4d |
- KRB5_CONF_PATH="${sysconfdir}/krb5.conf"
|
|
|
905b4d |
+ KRB5_CONF_PATH="\"SYSCONFDIR\"/krb5.conf"
|
|
|
905b4d |
if test x"$with_krb5_conf" != x; then
|
|
|
905b4d |
KRB5_CONF_PATH=$with_krb5_conf
|
|
|
905b4d |
fi
|
|
|
905b4d |
diff --git a/src/tests/cwrap/Makefile.am b/src/tests/cwrap/Makefile.am
|
|
|
905b4d |
index 02be67387110c0a440b647c35bba0c10e89e699d..46abab5ae32189b0561d1901407d2bb38a1ec4c0 100644
|
|
|
905b4d |
--- a/src/tests/cwrap/Makefile.am
|
|
|
905b4d |
+++ b/src/tests/cwrap/Makefile.am
|
|
|
905b4d |
@@ -4,7 +4,9 @@ AM_CPPFLAGS = \
|
|
|
905b4d |
-I$(top_srcdir)/src \
|
|
|
905b4d |
-I. \
|
|
|
905b4d |
-DLOCALEDIR=\"$(localedir)\" \
|
|
|
905b4d |
+ -DLIBDIR=\"$(libdir)\" \
|
|
|
905b4d |
-DVARDIR=\"$(localstatedir)\" \
|
|
|
905b4d |
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
|
|
|
905b4d |
$(DBUS_CFLAGS) \
|
|
|
905b4d |
$(GLIB2_CFLAGS) \
|
|
|
905b4d |
$(NULL)
|
|
|
905b4d |
--
|
|
|
905b4d |
1.9.3
|
|
|
905b4d |
|