From b5a922ded48de4cec9d9fa82568ee5606a6d1b1f Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Tue, 5 Feb 2008 05:13:13 +0000
Subject: [PATCH] configure.in: Enable D-Bus by default.

---
 ChangeLog    |  4 ++++
 configure    | 16 ++++++++++------
 configure.in |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index abedbb979e0..3718777de54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-05  Tom Tromey  <tromey@redhat.com>
+
+	* configure.in (--with-dbus): Default to enabled.
+
 2008-02-05  Kenichi Handa  <handa@ni.aist.go.jp>
 
 	* INSTALL (Complex Text Layout support libraries): New section.
diff --git a/configure b/configure
index 84369d0c041..c02114395e8 100755
--- a/configure
+++ b/configure
@@ -1371,7 +1371,7 @@ Optional Packages:
   --with-carbon           use Carbon GUI on Mac OS X. This is unsupported!
   --without-gpm           don't use -lgpm for mouse support on a GNU/Linux
                           console
-  --with-dbus             compile with D-Bus support
+  --without-dbus          don't compile with D-Bus support
   --with-pkg-config-prog=PATH
                           Path to pkg-config for finding GTK and librsvg
   --with-x                use the X Window System
@@ -2099,7 +2099,7 @@ fi
 if test "${with_dbus+set}" = set; then
   withval=$with_dbus;
 else
-      with_dbus=no
+     with_dbus=yes
 fi
 
 
@@ -18636,11 +18636,13 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -18680,11 +18682,13 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
diff --git a/configure.in b/configure.in
index cded82a68d3..2e82a5bd13a 100644
--- a/configure.in
+++ b/configure.in
@@ -147,7 +147,7 @@ OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
 OPTION_DEFAULT_OFF([carbon],[use Carbon GUI on Mac OS X.  This is unsupported!])
 
 OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
-OPTION_DEFAULT_OFF([dbus],[compile with D-Bus support])
+OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
 
 AC_ARG_WITH([pkg-config-prog],dnl
 [AS_HELP_STRING([--with-pkg-config-prog=PATH],
-- 
2.39.5