From c7cbf6f2f6d008afe2987356163122d3773ec823 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Mon, 7 Sep 2009 18:06:21 +0200
Subject: fix libdbus configure check

- remove unneeded CFLAGS component
- do not leak LDFLAGS used by configure check to final Makefile
---
 server/Makefile.am  | 1 -
 server/configure.ac | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/Makefile.am b/server/Makefile.am
index 12ec4b1b9..e1f7f3bcf 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -110,7 +110,6 @@ DHASH_LIBS = \
 AM_CPPFLAGS = -Wall \
     -Iinclude \
     -I.. \
-    -I$(DBUS_CFLAGS) \
     -I$(srcdir)/include \
     -Iinclude \
     -I. \
diff --git a/server/configure.ac b/server/configure.ac
index 3ecd0c392..8e7ea0bf5 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -65,10 +65,12 @@ m4_include([util/signal.m4])
 
 PKG_CHECK_MODULES([DBUS],[dbus-1])
 if test x$has_dbus != xno; then
+    SAFE_LDFLAGS="$LDFLAGS"
     LDFLAGS="$DBUS_LIBS"
     AC_CHECK_FUNC([dbus_watch_get_unix_fd],
                   AC_DEFINE([HAVE_DBUS_WATCH_GET_UNIX_FD], [1],
                             [Define if dbus_watch_get_unix_fd exists]))
+    LDFLAGS="$SAFE_LDFLAGS"
 fi
 
 PKG_CHECK_MODULES([NSS],[nss])
-- 
cgit