[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in,v
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in,v |
Date: |
Sun, 02 Dec 2007 15:46:01 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Albinus <albinus> 07/12/02 15:46:00
Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -b -r1.481 -r1.482
--- configure.in 28 Nov 2007 08:20:09 -0000 1.481
+++ configure.in 2 Dec 2007 15:45:59 -0000 1.482
@@ -118,6 +118,7 @@
EMACS_ARG_N([xaw3d],[don't use Xaw3d])
EMACS_ARG_N([xim],[don't use X11 XIM])
EMACS_ARG_N([carbon],[don't use Carbon GUI on Mac OS X])
+EMACS_ARG_N([dbus],[don't use D-Bus])
AC_ARG_ENABLE(carbon-app,
[AS_HELP_STRING([--enable-carbon-app@<:@=DIR@:>@],
@@ -2258,6 +2259,25 @@
fi
fi
+dnl D-Bus has been tested under GNU/Linux only. Must be adapted for
+dnl other platforms. Support for higher D-Bus versions but 1.0 is
+dnl also not configured.
+HAVE_DBUS=no
+if test "${with_dbus}" = "yes"; then
+ AC_CHECK_LIB(dbus-1, dbus_bus_get, HAVE_DBUS=yes)
+ if test "$HAVE_DBUS" = yes; then
+ AC_DEFINE(HAVE_DBUS, 1, [Define to 1 if using D-Bus.])
+ DBUS_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
+ AC_SUBST(DBUS_CFLAGS)
+ DBUS_LIBS="-ldbus-1"
+ AC_SUBST(DBUS_LIBS)
+ DBUS_INFO="dbus"
+ fi
+fi
+dnl This must be substituted always, because the top level Makefile
+dnl cannot check for $HAVE_DBUS.
+AC_SUBST(DBUS_INFO)
+
### Link with -lXft if available to work around a bug.
HAVE_XFT=maybe
if test "${HAVE_GTK}" = "yes"; then
@@ -3477,6 +3497,11 @@
echo
fi
+if test "$HAVE_DBUS" = yes && test "${opsys}" != "gnu-linux"; then
+ echo "D-Bus integration has been tested for GNU/Linux only."
+ echo
+fi
+
# Remove any trailing slashes in these variables.
[test "${prefix}" != NONE &&
- [Emacs-diffs] Changes to emacs/configure.in,v,
Michael Albinus <=
- [Emacs-diffs] Changes to emacs/configure.in,v, Michael Albinus, 2007/12/03
- [Emacs-diffs] Changes to emacs/configure.in,v, Magnus Henoch, 2007/12/03
- [Emacs-diffs] Changes to emacs/configure.in,v, Jan Djärv, 2007/12/04
- [Emacs-diffs] Changes to emacs/configure.in,v, Jan Djärv, 2007/12/06
- [Emacs-diffs] Changes to emacs/configure.in,v, Andreas Schwab, 2007/12/09