diff options
| author | Sumit Bose <sbose@redhat.com> | 2009-03-31 15:45:07 +0200 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2009-04-01 11:02:05 -0400 |
| commit | 68ea74985231880a7c113aacefe19445c010a320 (patch) | |
| tree | 0c827bcdf5ac1e2c81a6e69db28a0cbfd0774979 /server | |
| parent | 99c38e7eec4eda354afe4936cc9e7a5653a0f137 (diff) | |
| download | sssd-68ea74985231880a7c113aacefe19445c010a320.tar.gz sssd-68ea74985231880a7c113aacefe19445c010a320.tar.xz sssd-68ea74985231880a7c113aacefe19445c010a320.zip | |
allow compilation with older version of dbus
Diffstat (limited to 'server')
| -rw-r--r-- | server/configure.ac | 6 | ||||
| -rw-r--r-- | server/sbus/sssd_dbus_connection.c | 4 | ||||
| -rw-r--r-- | server/sbus/sssd_dbus_server.c | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/server/configure.ac b/server/configure.ac index a61289c36..af77da6de 100644 --- a/server/configure.ac +++ b/server/configure.ac @@ -51,6 +51,12 @@ m4_include(ldap.m4) m4_include(util/signal.m4) PKG_CHECK_MODULES([DBUS],[dbus-1]) +if test x$has_dbus != xno; then + 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])) +fi if test x$HAVE_TESTS != x; then PKG_CHECK_MODULES([CHECK],[check]) fi diff --git a/server/sbus/sssd_dbus_connection.c b/server/sbus/sssd_dbus_connection.c index 3629957ee..9c33d2243 100644 --- a/server/sbus/sssd_dbus_connection.c +++ b/server/sbus/sssd_dbus_connection.c @@ -170,7 +170,11 @@ static dbus_bool_t sbus_add_conn_watch(DBusWatch *watch, void *data) conn_w_ctx->watch = watch; flags = dbus_watch_get_flags(watch); +#ifdef HAVE_DBUS_WATCH_GET_UNIX_FD conn_w_ctx->fd = dbus_watch_get_unix_fd(watch); +#else + conn_w_ctx->fd = dbus_watch_get_fd(watch); +#endif event_flags = 0; diff --git a/server/sbus/sssd_dbus_server.c b/server/sbus/sssd_dbus_server.c index e30f9abfb..ec01c77c3 100644 --- a/server/sbus/sssd_dbus_server.c +++ b/server/sbus/sssd_dbus_server.c @@ -102,7 +102,11 @@ static dbus_bool_t sbus_add_srv_watch(DBusWatch *watch, void *data) svw_ctx->watch = watch; flags = dbus_watch_get_flags(watch); +#ifdef HAVE_DBUS_WATCH_GET_UNIX_FD svw_ctx->fd = dbus_watch_get_unix_fd(watch); +#else + svw_ctx->fd = dbus_watch_get_fd(watch); +#endif event_flags = 0; |