Contents of /trunk/dbus/patches/dbus-0.50-dnotify-configure-1.patch
Parent Directory
|
Revision Log
Revision 144 -
(show annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2197 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2197 byte(s)
-import
1 | Index: configure.in |
2 | =================================================================== |
3 | RCS file: /cvs/dbus/dbus/configure.in,v |
4 | retrieving revision 1.137 |
5 | diff -u -r1.137 configure.in |
6 | --- configure.in 20 Oct 2005 14:56:24 -0000 1.137 |
7 | +++ configure.in 2 Nov 2005 14:06:29 -0000 |
8 | @@ -64,6 +64,7 @@ |
9 | AC_ARG_ENABLE(mono_docs, [ --enable-mono-docs build mono docs],enable_mono_docs=$enableval,enable_mono_docs=no) |
10 | AC_ARG_ENABLE(python, [ --enable-python build python bindings],enable_python=$enableval,enable_python=auto) |
11 | AC_ARG_ENABLE(selinux, [ --enable-selinux build with SELinux support],enable_selinux=$enableval,enable_selinux=auto) |
12 | +AC_ARG_ENABLE(dnotify, [ --enable-dnotify build with dnotify support (linux only)],enable_dnotify=$enableval,enable_dnotify=auto) |
13 | |
14 | AC_ARG_WITH(xml, [ --with-xml=[libxml/expat] XML library to use]) |
15 | AC_ARG_WITH(init-scripts, [ --with-init-scripts=[redhat] Style of init scripts to install]) |
16 | @@ -829,21 +830,21 @@ |
17 | fi |
18 | |
19 | # dnotify checks |
20 | -if test x$target_os = xlinux-gnu; then |
21 | - AC_ARG_ENABLE(dnotify, |
22 | - [ --disable-dnotify Disable using dnotify on Linux], |
23 | - [case "${enableval}" in |
24 | - yes) dnotify=false ;; |
25 | - no) dnotify=true ;; |
26 | - *) AC_MSG_ERROR(bad value ${enableval} for --disable-dnotify) ;; |
27 | - esac],[dnotify=true]) |
28 | +if test x$enable_dnotify = xno ; then |
29 | + have_dnotify=no; |
30 | +else |
31 | + if test x$target_os = xlinux-gnu -o x$target_os = xlinux; then |
32 | + have_dnotify=yes; |
33 | + else |
34 | + have_dnotify=no; |
35 | + fi |
36 | fi |
37 | + |
38 | dnl check if dnotify backend is enabled |
39 | -if test x$dnotify = xtrue; then |
40 | +if test x$have_dnotify = xyes; then |
41 | AC_DEFINE(DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX,1,[Use dnotify on Linux]) |
42 | fi |
43 | |
44 | - |
45 | #### Set up final flags |
46 | DBUS_CLIENT_CFLAGS= |
47 | DBUS_CLIENT_LIBS= |
48 | @@ -1421,6 +1422,7 @@ |
49 | Building GLib bindings: ${have_glib} |
50 | Building Python bindings: ${have_python} |
51 | Building SELinux support: ${have_selinux} |
52 | + Building dnotify support: ${have_dnotify} |
53 | Building Mono bindings: ${enable_mono} |
54 | Building Mono docs: ${enable_mono_docs} |
55 | Building GTK+ tools: ${have_gtk} |
56 |