From d1d0ca435f8b4aa875b0631559900b33dd578e4b Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Mon, 2 Feb 2009 13:52:44 -0500
Subject: [PATCH] Build system modifications to simplify RPM generation

---
 server/Makefile.in         |    6 +++---
 server/conf_macros.m4      |   13 -------------
 server/configure.ac        |    1 -
 server/nss/nsssrv_packet.c |    2 +-
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/server/Makefile.in b/server/Makefile.in
index d9fb3f6..64f5b0f 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -66,7 +66,7 @@ OBJS = $(SERVER_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ)
 
 headers =
 
-DBUS_SYSBUS_POLICY_DIR = @sysbuspath@
+DBUS_SYSBUS_POLICY_DIR = @sysconfdir@/dbus-1/system.d
 
 LIBEXECBINS =  sbin/sssd_nss sbin/sssd_dp sbin/sssd_be sbin/sssd_info sbin/sssd_pk
 DBUS_SYSBUS_POLICIES = infopipe/org.freeipa.sssd.infopipe.conf
@@ -104,7 +104,7 @@ install:: all installdirs installheaders installlibs installbin installsupport
 	${INSTALLCMD} -m 755 lib/memberof.$(SHLIBEXT) $(DESTDIR)$(libdir)
 
 installdirs::
-	mkdir -p $(DESTDIR)$(includedir) $(DESTDIR)$(libdir) $(DESTDIR)$(sbindir) $(DBUS_SYSBUS_POLICY_DIR)
+	mkdir -p $(DESTDIR)$(includedir) $(DESTDIR)$(libdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(DBUS_SYSBUS_POLICY_DIR)
 
 installheaders:: installdirs
 ifneq (x$(headers), x)
@@ -119,4 +119,4 @@ endif
 installbin:: installdirs
 
 installsupport:: installdirs
-	cp $(DBUS_SYSBUS_POLICIES) $(DBUS_SYSBUS_POLICY_DIR)
+	cp $(DBUS_SYSBUS_POLICIES) $(DESTDIR)$(DBUS_SYSBUS_POLICY_DIR)
diff --git a/server/conf_macros.m4 b/server/conf_macros.m4
index 33290d8..81cfd6e 100644
--- a/server/conf_macros.m4
+++ b/server/conf_macros.m4
@@ -58,16 +58,3 @@ AC_DEFUN(WITH_PIPE_PATH,
     AC_DEFINE_UNQUOTED(PIPE_PATH, "$pipepath", [Where to store pipe files for the SSSD interconnects])
   ])
 
-AC_DEFUN(WITH_DBUS_SYSBUS_PATH,
-  [ AC_ARG_WITH([dbus-sysbus-path],
-                [AC_HELP_STRING([--with-dbus-sysbus-path=PATH],
-                                [Where to store policy files for the D-BUS system bus [/etc/dbus-1/system.d]]
-                               )
-                ]
-               )
-    sysbuspath="/etc/dbus-1/system.d"
-    if test x"$with_dbus_sysbus_path" != x; then
-        sysbuspath=$with_dbus_sysbus_path
-    fi
-    AC_SUBST(sysbuspath)
-  ])
diff --git a/server/configure.ac b/server/configure.ac
index 54dedd9..94c057f 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -37,7 +37,6 @@ WITH_DB_PATH
 WITH_PLUGIN_PATH
 WITH_PID_PATH
 WITH_PIPE_PATH
-WITH_DBUS_SYSBUS_PATH
 
 m4_include(pkg.m4)
 m4_include(libpopt.m4)
diff --git a/server/nss/nsssrv_packet.c b/server/nss/nsssrv_packet.c
index bdf453f..f79087d 100644
--- a/server/nss/nsssrv_packet.c
+++ b/server/nss/nsssrv_packet.c
@@ -23,7 +23,7 @@
 #include <sys/socket.h>
 #include <string.h>
 #include <errno.h>
-#include "../talloc/talloc.h"
+#include "talloc.h"
 #include "util/util.h"
 #include "nss/nsssrv.h"
 
-- 
1.6.0.6

