diff options
| author | Sumit Bose <sbose@redhat.com> | 2014-11-21 15:22:24 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-11-25 13:28:31 +0100 |
| commit | eaaeaa7e00c3d4bfa792cc4d3c6770dc1e28ef0c (patch) | |
| tree | becb33509740cd84b710c258ac3d0b3351ea96ea | |
| parent | ca92e649ed6501c225782f59914a2c506026c10c (diff) | |
| download | sssd-eaaeaa7e00c3d4bfa792cc4d3c6770dc1e28ef0c.tar.gz sssd-eaaeaa7e00c3d4bfa792cc4d3c6770dc1e28ef0c.tar.xz sssd-eaaeaa7e00c3d4bfa792cc4d3c6770dc1e28ef0c.zip | |
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>
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/conf_macros.m4 | 2 | ||||
| -rw-r--r-- | src/tests/cwrap/Makefile.am | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 53ace65b9..56a562c76 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 fbee81f56..df9d1ddf8 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 d98bb3379..c1991a19c 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) |