aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-01-24 04:50:50 +0000
committerGlenn Morris2008-01-24 04:50:50 +0000
commitbf9a7ece32985dea7fbbb23852c3b68d3d9ef8b1 (patch)
tree3a9e683866ef294bcc8c91ebd8a66d7992d7c258
parent478975a92ab0e5d966082be1b565bb3792bfd987 (diff)
downloademacs-bf9a7ece32985dea7fbbb23852c3b68d3d9ef8b1.tar.gz
emacs-bf9a7ece32985dea7fbbb23852c3b68d3d9ef8b1.zip
Standardize dbus-related messages.
-rw-r--r--ChangeLog9
-rw-r--r--configure.in7
2 files changed, 7 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 8781c18be12..de0e388afb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,14 @@
12008-01-24 Glenn Morris <rgm@gnu.org>
2
3 * configure.in: Standardize dbus-related messages.
4
12008-01-23 Michael Olson <mwolson@gnu.org> 52008-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
72008-01-23 Tom Tromey <tromey@redhat.com> 92008-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
1771fi 1771fi
1772 1772
1773dnl D-Bus has been tested under GNU/Linux only. Must be adapted for 1773dnl D-Bus has been tested under GNU/Linux only. Must be adapted for
1774dnl other platforms. Support for higher D-Bus versions but 1.0 is 1774dnl other platforms. Support for higher D-Bus versions than 1.0 is
1775dnl also not configured. 1775dnl also not configured.
1776HAVE_DBUS=no 1776HAVE_DBUS=no
1777AC_MSG_CHECKING([maybe dbus])
1778if test "${with_dbus}" = "yes"; then 1777if 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)
1784else
1785 AC_MSG_RESULT(no bub)
1786fi 1782fi
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_
2971echo " Does Emacs use -lpng? ${HAVE_PNG}" 2967echo " Does Emacs use -lpng? ${HAVE_PNG}"
2972echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" 2968echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}"
2973echo " Does Emacs use -lgpm? ${HAVE_GPM}" 2969echo " Does Emacs use -lgpm? ${HAVE_GPM}"
2970echo " Does Emacs use -ldbus? ${HAVE_DBUS}"
2974echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" 2971echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
2975echo 2972echo
2976 2973