correct macro for descriptor detectionrelease-0.9

2 files changed, 16 insertions, 19 deletions

diff --git a/configure.ac b/configure.ac
index e4c936a..0dc4b91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,25 +49,20 @@ AC_ARG_ENABLE(examples,
  	[enable_examples=yes]
 )
 
-AC_CHECK_FUNCS(clock_gettime, [], [
-  AC_CHECK_LIB(rt, clock_gettime, [
-    AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
-    RT_LIBS="-lrt"
-  ])
-])
-AC_SUBST(RT_LIBS)
-
-AC_CHECK_LIB(dbus-1, dbus_watch_get_unix_fd, [
-  AC_DEFINE([HAVE_DBUS_WATCH_GET_UNIX_FD, 1], [], [Check for dbus_watch_get_unix_fd])
-])
-
-AC_CHECK_LIB(dbus-1, dbus_watch_get_fd, [
-  AC_DEFINE([HAVE_DBUS_WATCH_GET_FD, 1], [], [Check for dbus_watch_get_fd])
-])
-
-AC_CHECK_LIB(dbus-1, dbus_watch_get_socket, [
-  AC_DEFINE([HAVE_DBUS_WATCH_GET_socket, 1], [], [Check for dbus_watch_get_socket])
-])
+AC_CHECK_LIB(dbus-1, dbus_watch_get_unix_fd,
+  [AC_DEFINE(HAVE_DBUS_WATCH_GET_UNIX_FD, 1, [Check for dbus_watch_get_unix_fd])], 
+  []
+)
+
+AC_CHECK_LIB(dbus-1, dbus_watch_get_fd, 
+  [AC_DEFINE(HAVE_DBUS_WATCH_GET_FD, 1, [Check for dbus_watch_get_fd])],
+  []
+)
+
+AC_CHECK_LIB(dbus-1, dbus_watch_get_socket,
+  [AC_DEFINE(HAVE_DBUS_WATCH_GET_SOCKET, 1, [Check for dbus_watch_get_socket])],
+  []
+)
 
 # Check for programs
 
diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp
index 4566220..527b854 100644
--- a/src/dispatcher.cpp
+++ b/src/dispatcher.cpp
@@ -76,6 +76,8 @@ int Watch::descriptor() const
   return dbus_watch_get_fd((DBusWatch *)_int);
 #elif HAVE_DBUS_WATCH_GET_SOCKET
   return dbus_watch_get_socket((DBusWatch *)_int);
+#else
+#error "No implementation available"
 #endif
 }