diff options
Diffstat (limited to 'server')
| -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]) |