diff options
| author | Sumit Bose <sbose@redhat.com> | 2009-09-07 18:06:21 +0200 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-09-08 10:22:15 -0400 |
| commit | c7cbf6f2f6d008afe2987356163122d3773ec823 (patch) | |
| tree | ea39bc2539f0aac383e0881dcd66a712d2d293f6 | |
| parent | 33396dc46ea52c18f47db1b5d590880806521005 (diff) | |
| download | sssd-c7cbf6f2f6d008afe2987356163122d3773ec823.tar.gz sssd-c7cbf6f2f6d008afe2987356163122d3773ec823.tar.bz2 sssd-c7cbf6f2f6d008afe2987356163122d3773ec823.zip | |
fix libdbus configure check
- remove unneeded CFLAGS component
- do not leak LDFLAGS used by configure check to final Makefile
| -rw-r--r-- | server/Makefile.am | 1 | ||||
| -rw-r--r-- | server/configure.ac | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 12ec4b1b..e1f7f3bc 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 3ecd0c39..8e7ea0bf 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]) |