xserver: Branch 'input-hotplug' - 2 commits

[Daniel Stone]

 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 87a6346bf7f086b5f98b2b2ecd52f27efe864e56 (from parents)
Merge: b73fb2ae35a82e0bdd48f01132e971fb84946ff1 0486d3966d2888ef86d36c19f31bdbc2a3e8c652
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Fri Jul 21 19:36:25 2006 -0400

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

diff --cc configure.ac
index 456b8b5,f8aa32a..a20237c
@@@ -515,21 -509,9 +515,21 @@@
  XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
  
  dnl Core modules for most extensions, et al.
- REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4]"
 -REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4] [kbproto >= 1.0.3]"
  REQUIRED_LIBS="xfont xau fontenc"
  
 +if test "x$DBUS" = xauto; then
 +       PKG_CHECK_MODULES(DBUS, dbus-1, [DBUS=yes], [DBUS=no])
 +fi
 +if test "x$DBUS" = xyes; then
 +       PKG_CHECK_MODULES(DBUS, dbus-1)
 +       AC_DEFINE(HAVE_DBUS, 1, [Have D-BUS support])
 +       REQUIRED_MODULES="$REQUIRED_MODULES dbus-1"
 +       REQUIRED_LIBS="$REQUIRED_LIBS dbus-1"
 +fi
 +CONFIG_LIB='$(top_builddir)/config/libconfig.a'
 +AM_CONDITIONAL(DBUS, [test "x$DBUS" = xyes])
 +
  AM_CONDITIONAL(XV, [test "x$XV" = xyes])
  if test "x$XV" = xyes; then
  	AC_DEFINE(XV, 1, [Support Xv extension])
diff-tree 0486d3966d2888ef86d36c19f31bdbc2a3e8c652 (from aff404f293ed86a44a093a51a9f11e79e6c3f4f6)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Fri Jul 21 19:35:04 2006 -0400

    fix kbproto dependency
    Depend on kbproto >= 1.0.3, for unconditional definition of
    XkbSA_XFree86Private.

diff --git a/configure.ac b/configure.ac
index a2af599..f8aa32a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -509,7 +509,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.l
 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
 
 dnl Core modules for most extensions, et al.
-REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto"
+REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
 REQUIRED_LIBS="xfont xau fontenc"
 
 AM_CONDITIONAL(XV, [test "x$XV" = xyes])