diff options
| author | Daniel Stone <daniel.stone@nokia.com> | 2006-07-19 17:00:23 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-21 15:19:51 -0400 |
| commit | 3a23e499017d5823157806029263edac53c663fd (patch) | |
| tree | 20b7d3a87ab1ed0dddb64d71a80b2dc190e97c90 | |
| parent | 02d09105113fb9b560a770fe15f7bb041165831c (diff) | |
make XInput mandatory
Always build Xi, since GetPointerEvents/GetKeyboardEvents relies on it.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 799815ee2..eebdd0a61 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,10 +26,6 @@ if GLX GLX_DIR=GL endif -if XINPUT -XINPUT_DIR=Xi -endif - if DBE DBE_DIR=dbe endif @@ -45,7 +41,7 @@ SUBDIRS = \ os \ randr \ render \ - $(XINPUT_DIR) \ + Xi \ xkb \ $(DBE_DIR) \ $(MFB_DIR) \ diff --git a/configure.ac b/configure.ac index 186f2f9a1..7a979704e 100644 --- a/configure.ac +++ b/configure.ac @@ -422,7 +422,6 @@ AC_ARG_ENABLE(fontcache, AS_HELP_STRING([--enable-fontcache], [Build FontCa AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes]) AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes]) AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) -AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) AC_ARG_ENABLE(dbus, AS_HELP_STRING([--disable-dbus], [Build D-BUS support (default: auto)]), [DBUS=$enableval], [DBUS=auto]) dnl DDXes. @@ -733,12 +732,9 @@ if test "$COMPOSITE" = yes; then fi MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage' -AM_CONDITIONAL(XINPUT, [test "x$XINPUT" = xyes]) -if test "x$XINPUT" = xyes; then - AC_DEFINE(XINPUT, 1, [Support X Input extension]) - XI_LIB='$(top_builddir)/Xi/libXi.la' - XI_INC='-I$(top_srcdir)/Xi' -fi +AC_DEFINE(XINPUT, 1, [Support X Input extension]) +XI_LIB='$(top_builddir)/Xi/libXi.la' +XI_INC='-I$(top_srcdir)/Xi' AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) |