diff options
| author | Michael Olson | 2008-02-05 05:13:13 +0000 |
|---|---|---|
| committer | Michael Olson | 2008-02-05 05:13:13 +0000 |
| commit | b5a922ded48de4cec9d9fa82568ee5606a6d1b1f (patch) | |
| tree | 9ca8e93116d88679fc2f3b000905456d90ae11f5 | |
| parent | fccaebfd64a63b31f0bdc295ecc063a4d9977409 (diff) | |
| download | emacs-b5a922ded48de4cec9d9fa82568ee5606a6d1b1f.tar.gz emacs-b5a922ded48de4cec9d9fa82568ee5606a6d1b1f.zip | |
configure.in: Enable D-Bus by default.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 15 insertions, 7 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-02-05 Tom Tromey <tromey@redhat.com> | ||
| 2 | |||
| 3 | * configure.in (--with-dbus): Default to enabled. | ||
| 4 | |||
| 1 | 2008-02-05 Kenichi Handa <handa@ni.aist.go.jp> | 5 | 2008-02-05 Kenichi Handa <handa@ni.aist.go.jp> |
| 2 | 6 | ||
| 3 | * INSTALL (Complex Text Layout support libraries): New section. | 7 | * INSTALL (Complex Text Layout support libraries): New section. |
| @@ -1371,7 +1371,7 @@ Optional Packages: | |||
| 1371 | --with-carbon use Carbon GUI on Mac OS X. This is unsupported! | 1371 | --with-carbon use Carbon GUI on Mac OS X. This is unsupported! |
| 1372 | --without-gpm don't use -lgpm for mouse support on a GNU/Linux | 1372 | --without-gpm don't use -lgpm for mouse support on a GNU/Linux |
| 1373 | console | 1373 | console |
| 1374 | --with-dbus compile with D-Bus support | 1374 | --without-dbus don't compile with D-Bus support |
| 1375 | --with-pkg-config-prog=PATH | 1375 | --with-pkg-config-prog=PATH |
| 1376 | Path to pkg-config for finding GTK and librsvg | 1376 | Path to pkg-config for finding GTK and librsvg |
| 1377 | --with-x use the X Window System | 1377 | --with-x use the X Window System |
| @@ -2099,7 +2099,7 @@ fi | |||
| 2099 | if test "${with_dbus+set}" = set; then | 2099 | if test "${with_dbus+set}" = set; then |
| 2100 | withval=$with_dbus; | 2100 | withval=$with_dbus; |
| 2101 | else | 2101 | else |
| 2102 | with_dbus=no | 2102 | with_dbus=yes |
| 2103 | fi | 2103 | fi |
| 2104 | 2104 | ||
| 2105 | 2105 | ||
| @@ -18636,11 +18636,13 @@ _ACEOF | |||
| 18636 | cat confdefs.h >>conftest.$ac_ext | 18636 | cat confdefs.h >>conftest.$ac_ext |
| 18637 | cat >>conftest.$ac_ext <<_ACEOF | 18637 | cat >>conftest.$ac_ext <<_ACEOF |
| 18638 | /* end confdefs.h. */ | 18638 | /* end confdefs.h. */ |
| 18639 | #include <stdio.h> | 18639 | #include <sys/types.h> /* for off_t */ |
| 18640 | #include <stdio.h> | ||
| 18640 | int | 18641 | int |
| 18641 | main () | 18642 | main () |
| 18642 | { | 18643 | { |
| 18643 | return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); | 18644 | int (*fp) (FILE *, off_t, int) = fseeko; |
| 18645 | return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); | ||
| 18644 | ; | 18646 | ; |
| 18645 | return 0; | 18647 | return 0; |
| 18646 | } | 18648 | } |
| @@ -18680,11 +18682,13 @@ cat confdefs.h >>conftest.$ac_ext | |||
| 18680 | cat >>conftest.$ac_ext <<_ACEOF | 18682 | cat >>conftest.$ac_ext <<_ACEOF |
| 18681 | /* end confdefs.h. */ | 18683 | /* end confdefs.h. */ |
| 18682 | #define _LARGEFILE_SOURCE 1 | 18684 | #define _LARGEFILE_SOURCE 1 |
| 18683 | #include <stdio.h> | 18685 | #include <sys/types.h> /* for off_t */ |
| 18686 | #include <stdio.h> | ||
| 18684 | int | 18687 | int |
| 18685 | main () | 18688 | main () |
| 18686 | { | 18689 | { |
| 18687 | return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); | 18690 | int (*fp) (FILE *, off_t, int) = fseeko; |
| 18691 | return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); | ||
| 18688 | ; | 18692 | ; |
| 18689 | return 0; | 18693 | return 0; |
| 18690 | } | 18694 | } |
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]) | |||
| 147 | OPTION_DEFAULT_OFF([carbon],[use Carbon GUI on Mac OS X. This is unsupported!]) | 147 | OPTION_DEFAULT_OFF([carbon],[use Carbon GUI on Mac OS X. This is unsupported!]) |
| 148 | 148 | ||
| 149 | OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console]) | 149 | OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console]) |
| 150 | OPTION_DEFAULT_OFF([dbus],[compile with D-Bus support]) | 150 | OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support]) |
| 151 | 151 | ||
| 152 | AC_ARG_WITH([pkg-config-prog],dnl | 152 | AC_ARG_WITH([pkg-config-prog],dnl |
| 153 | [AS_HELP_STRING([--with-pkg-config-prog=PATH], | 153 | [AS_HELP_STRING([--with-pkg-config-prog=PATH], |