>From 7ff65c88c9995f43788cadf0b5aeddd022b06bbe Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Tue, 16 Jun 2015 13:00:42 +0200
Subject: [PATCH 1/2] CONFIG: Add SSS_STATEDIR as VARDIR/lib/sss

---
 Makefile.am                 |  2 ++
 src/conf_macros.m4          | 10 +++++-----
 src/tests/cwrap/Makefile.am |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2904ce776770e8006f63f53b71863538c1453e64..a2db8e19f6880b414a565461aec49817b71f53ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,6 +54,7 @@ sssddatadir = $(datadir)/sssd
 sssdapiplugindir = $(sssddatadir)/sssd.api.d
 dbuspolicydir = $(sysconfdir)/dbus-1/system.d
 dbusservicedir = $(datadir)/dbus-1/system-services
+sss_statedir = $(localstatedir)/lib/sss
 localedir = @localedir@
 nsslibdir = @nsslibdir@
 pamlibdir = @pammoddir@
@@ -405,6 +406,7 @@ AM_CPPFLAGS = \
     $(JOURNALD_CFLAGS) \
     -DLIBDIR=\"$(libdir)\" \
     -DVARDIR=\"$(localstatedir)\" \
+    -DSSS_STATEDIR=\"$(sss_statedir)\" \
     -DSYSCONFDIR=\"$(sysconfdir)\" \
     -DSHLIBEXT=\"$(SHLIBEXT)\" \
     -DSSSD_LIBEXEC_PATH=\"$(sssdlibexecdir)\" \
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index eeba01e1b81ceb70766544ef2d3c004e8595658d..c6ce00059094aa0359f6af9efefe7c7438c1e28f 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -5,7 +5,7 @@ AC_DEFUN([WITH_DB_PATH],
                                )
                 ]
                )
-    config_dbpath="\"VARDIR\"/lib/sss/db"
+    config_dbpath="\"SSS_STATEDIR\"/db"
     dbpath="${localstatedir}/lib/sss/db"
     if test x"$with_db_path" != x; then
         config_dbpath=$with_db_path
@@ -73,7 +73,7 @@ AC_DEFUN([WITH_PUBCONF_PATH],
                                )
                 ]
                )
-    config_pubconfpath="\"VARDIR\"/lib/sss/pubconf"
+    config_pubconfpath="\"SSS_STATEDIR\"/pubconf"
     pubconfpath="${localstatedir}/lib/sss/pubconf"
     if test x"$with_pubconf_path" != x; then
         config_pubconfpath=$with_pubconf_path
@@ -90,7 +90,7 @@ AC_DEFUN([WITH_PIPE_PATH],
                                )
                 ]
                )
-    config_pipepath="\"VARDIR\"/lib/sss/pipes"
+    config_pipepath="\"SSS_STATEDIR\"/pipes"
     pipepath="${localstatedir}/lib/sss/pipes"
     if test x"$with_pipe_path" != x; then
         config_pipepath=$with_pipe_path
@@ -107,7 +107,7 @@ AC_DEFUN([WITH_MCACHE_PATH],
                                )
                 ]
                )
-    config_mcpath="\"VARDIR\"/lib/sss/mc"
+    config_mcpath="\"SSS_STATEDIR\"/mc"
     mcpath="${localstatedir}/lib/sss/mc"
     if test x"$with_mcache_path" != x; then
         config_mcpath=$with_mcache_path
@@ -491,7 +491,7 @@ AC_DEFUN([WITH_GPO_CACHE_PATH],
                                )
                 ]
                )
-    config_gpocachepath="\"VARDIR\"/lib/sss/gpo_cache"
+    config_gpocachepath="\"SSS_STATEDIR\"/gpo_cache"
     gpocachepath="${localstatedir}/lib/sss/gpo_cache"
     if test x"$with_gpo_cache_path" != x; then
         config_gpocachepath=$with_gpo_cache_path
diff --git a/src/tests/cwrap/Makefile.am b/src/tests/cwrap/Makefile.am
index b805e834977f60d6ba2efdf0f700061bb5e0e264..46f815ab566cdece059ce68760d8aebb31b7c558 100644
--- a/src/tests/cwrap/Makefile.am
+++ b/src/tests/cwrap/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
     -DLOCALEDIR=\"$(localedir)\" \
     -DLIBDIR=\"$(libdir)\" \
     -DVARDIR=\"$(localstatedir)\" \
+    -DSSS_STATEDIR=\"$(localstatedir)/lib/sss\" \
     -DSYSCONFDIR=\"$(sysconfdir)\" \
     $(DBUS_CFLAGS) \
     $(GLIB2_CFLAGS) \
-- 
2.4.3