Attachment 6684 Details for Bug 7998 – Proposed patch.

[patch] Proposed patch.

dbus-kqueue.diff (text/plain), 3.42 KB, created by Julio Merino on 2006-08-25 06:50:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julio Merino

Created: 2006-08-25 06:50:25 UTC

Size: 3.42 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>RCS file: /cvs/dbus/dbus/ChangeLog,v
>retrieving revision 1.1090
>diff -u -p -u -r1.1090 ChangeLog
>--- ChangeLog	20 Aug 2006 21:41:41 -0000	1.1090
>+++ ChangeLog	25 Aug 2006 13:40:07 -0000
>@@ -1,3 +1,9 @@
>+2006-08-25  Julio M. Merino Vidal  <jmmv@NetBSD.org>
>+
>+	* configure.ac, bus/Makefile.am: Generalize kqueue support so that
>+	it works on any system providing this interface, not only FreeBSD.
>+	For example, NetBSD.
>+
> 2006-08-20  Havoc Pennington  <hp@redhat.com>
> 
> 	* doc/dbus-faq.xml, doc/dbus-tutorial.xml: some improvements to
>Index: configure.in
>===================================================================
>RCS file: /cvs/dbus/dbus/configure.in,v
>retrieving revision 1.169
>diff -u -p -u -r1.169 configure.in
>--- configure.in	18 Aug 2006 20:31:03 -0000	1.169
>+++ configure.in	25 Aug 2006 13:40:07 -0000
>@@ -57,7 +57,7 @@ AC_ARG_ENABLE(gcov, AS_HELP_STRING([--en
> AC_ARG_ENABLE(abstract-sockets, AS_HELP_STRING([--enable-abstract-sockets],[use abstract socket namespace (linux only)]),enable_abstract_sockets=$enableval,enable_abstract_sockets=auto)
> AC_ARG_ENABLE(selinux, AS_HELP_STRING([--enable-selinux],[build with SELinux support]),enable_selinux=$enableval,enable_selinux=auto)
> AC_ARG_ENABLE(dnotify, AS_HELP_STRING([--enable-dnotify],[build with dnotify support (linux only)]),enable_dnotify=$enableval,enable_dnotify=auto)
>-AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support (FreeBSD only)]),enable_kqueue=$enableval,enable_kqueue=auto)
>+AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
> AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
> 
> AC_ARG_WITH(xml, AS_HELP_STRING([--with-xml=[libxml/expat]],[XML library to use]))
>@@ -721,24 +721,23 @@ AM_CONDITIONAL(DBUS_BUS_ENABLE_DNOTIFY_O
> 
> # kqueue checks
> if test x$enable_kqueue = xno ; then
>-    have_kqueue=no;
>+    have_kqueue=no
> else
>-    case "${target_os}" in
>-      freebsd*)
>-        have_kqueue=yes;
>-        ;;
>-      *)
>-        have_kqueue=no;
>-        ;;
>-    esac
>+    have_kqueue=yes
>+    AC_CHECK_HEADER(sys/event.h, , have_kqueue=no)
>+    AC_CHECK_FUNC(kqueue, , have_kqueue=no)
>+
>+    if test x$enable_kqueue = xyes -a x$have_kqueue = xno; then
>+        AC_MSG_ERROR(kqueue support explicitly enabled but not available)
>+    fi
> fi
> 
> dnl check if kqueue backend is enabled
> if test x$have_kqueue = xyes; then
>-   AC_DEFINE(DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD,1,[Use kqueue on FreeBSD])
>+   AC_DEFINE(DBUS_BUS_ENABLE_KQUEUE,1,[Use kqueue])
> fi
> 
>-AM_CONDITIONAL(DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD, test x$have_kqueue = xyes) 
>+AM_CONDITIONAL(DBUS_BUS_ENABLE_KQUEUE, test x$have_kqueue = xyes) 
> 
> dnl console owner file
> if test x$enable_console_owner_file = xno ; then
>Index: bus/Makefile.am
>===================================================================
>RCS file: /cvs/dbus/dbus/bus/Makefile.am,v
>retrieving revision 1.40
>diff -u -p -u -r1.40 Makefile.am
>--- bus/Makefile.am	8 Aug 2006 22:08:39 -0000	1.40
>+++ bus/Makefile.am	25 Aug 2006 13:40:07 -0000
>@@ -23,7 +23,7 @@ if DBUS_USE_EXPAT
> XML_SOURCES=config-loader-expat.c
> endif
> 
>-if DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD
>+if DBUS_BUS_ENABLE_KQUEUE
> DIR_WATCH_SOURCE=dir-watch-kqueue.c
> else
> if DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX

Actions: View | Splinter Review

Attachments on bug 7998: 6684

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.