diff options
| author | Glenn Morris | 2008-01-24 04:50:50 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-01-24 04:50:50 +0000 |
| commit | bf9a7ece32985dea7fbbb23852c3b68d3d9ef8b1 (patch) | |
| tree | 3a9e683866ef294bcc8c91ebd8a66d7992d7c258 | |
| parent | 478975a92ab0e5d966082be1b565bb3792bfd987 (diff) | |
| download | emacs-bf9a7ece32985dea7fbbb23852c3b68d3d9ef8b1.tar.gz emacs-bf9a7ece32985dea7fbbb23852c3b68d3d9ef8b1.zip | |
Standardize dbus-related messages.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 7 insertions, 9 deletions
| @@ -1,13 +1,14 @@ | |||
| 1 | 2008-01-24 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * configure.in: Standardize dbus-related messages. | ||
| 4 | |||
| 1 | 2008-01-23 Michael Olson <mwolson@gnu.org> | 5 | 2008-01-23 Michael Olson <mwolson@gnu.org> |
| 2 | 6 | ||
| 3 | * configure.in (pkg-config-prog): Remove initial whitespace. | 7 | * configure.in (pkg-config-prog): Remove initial whitespace. |
| 4 | 8 | ||
| 5 | * configure: Regenerate. | ||
| 6 | |||
| 7 | 2008-01-23 Tom Tromey <tromey@redhat.com> | 9 | 2008-01-23 Tom Tromey <tromey@redhat.com> |
| 8 | 10 | ||
| 9 | * configure.in (OPTION_DEFAULT_ON, OPTION_DEFAULT_OFF): New | 11 | * configure.in (OPTION_DEFAULT_ON, OPTION_DEFAULT_OFF): New macros. |
| 10 | macros. | ||
| 11 | (EMACS_ARG_Y, EMACS_ARG_N): Remove. | 12 | (EMACS_ARG_Y, EMACS_ARG_N): Remove. |
| 12 | Update all users. | 13 | Update all users. |
| 13 | 14 | ||
diff --git a/configure.in b/configure.in index 91a23e74f74..a13c1f31378 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -1771,18 +1771,14 @@ if test "${HAVE_GTK}" = "yes"; then | |||
| 1771 | fi | 1771 | fi |
| 1772 | 1772 | ||
| 1773 | dnl D-Bus has been tested under GNU/Linux only. Must be adapted for | 1773 | dnl D-Bus has been tested under GNU/Linux only. Must be adapted for |
| 1774 | dnl other platforms. Support for higher D-Bus versions but 1.0 is | 1774 | dnl other platforms. Support for higher D-Bus versions than 1.0 is |
| 1775 | dnl also not configured. | 1775 | dnl also not configured. |
| 1776 | HAVE_DBUS=no | 1776 | HAVE_DBUS=no |
| 1777 | AC_MSG_CHECKING([maybe dbus]) | ||
| 1778 | if test "${with_dbus}" = "yes"; then | 1777 | if test "${with_dbus}" = "yes"; then |
| 1779 | PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, HAVE_DBUS=yes, HAVE_DBUS=no) | 1778 | PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, HAVE_DBUS=yes, HAVE_DBUS=no) |
| 1780 | if test "$HAVE_DBUS" = yes; then | 1779 | if test "$HAVE_DBUS" = yes; then |
| 1781 | AC_DEFINE(HAVE_DBUS, 1, [Define to 1 if using D-Bus.]) | 1780 | AC_DEFINE(HAVE_DBUS, 1, [Define to 1 if using D-Bus.]) |
| 1782 | fi | 1781 | fi |
| 1783 | AC_MSG_RESULT($HAVE_DBUS) | ||
| 1784 | else | ||
| 1785 | AC_MSG_RESULT(no bub) | ||
| 1786 | fi | 1782 | fi |
| 1787 | 1783 | ||
| 1788 | ### Link with -lXft if available to work around a bug. | 1784 | ### Link with -lXft if available to work around a bug. |
| @@ -2971,6 +2967,7 @@ echo " Does Emacs use a gif library? ${HAVE_GIF} $ac_ | |||
| 2971 | echo " Does Emacs use -lpng? ${HAVE_PNG}" | 2967 | echo " Does Emacs use -lpng? ${HAVE_PNG}" |
| 2972 | echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" | 2968 | echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" |
| 2973 | echo " Does Emacs use -lgpm? ${HAVE_GPM}" | 2969 | echo " Does Emacs use -lgpm? ${HAVE_GPM}" |
| 2970 | echo " Does Emacs use -ldbus? ${HAVE_DBUS}" | ||
| 2974 | echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" | 2971 | echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" |
| 2975 | echo | 2972 | echo |
| 2976 | 2973 | ||