diff options
| author | Philip Langdale <philipl@fido2.homeip.net> | 2008-10-23 21:54:44 -0700 |
|---|---|---|
| committer | Philip Langdale <philipl@fido2.homeip.net> | 2008-10-23 21:54:44 -0700 |
| commit | eb03e96c1974a3fbe1c48c56974ff32bc886c8f7 (patch) | |
| tree | a0a671aa85dc18d54dcda82ab738ac3e332888a0 /configure.ac | |
| parent | 223afd09500672a7fe8a1ab5fc221001863a8bec (diff) | |
Add HAL integration to support input hot plug.
* vmmouse_detect: A simple program that detects whether a vmmouse
device is present.
* hal-probe-vmmouse: A HAL callout script that uses vmmouse_detect
and overrides input.x11_driver.
* 11-x11-vmmouse.fdi: fdi descriptor that adds the callout for PS/2
mice.
Additional 'configure' variables have been added to allow for overriding
HAL paths, although this shouldn't usually be necessary.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a389f3a..90e3d22 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,32 @@ AC_ARG_WITH(xorg-module-dir, inputdir=${moduledir}/input AC_SUBST(inputdir) +AC_ARG_WITH(hal_bin_dir, + AC_HELP_STRING([--with-hal-bin-dir=DIR], + [Directory where HAL binaries where installed [[default=$bindir]]]), + [halbindir="$withval"], + [halbindir="$bindir"]) +HAL_BIN_DIR=${halbindir} +AC_SUBST(HAL_BIN_DIR) + +AC_ARG_WITH(hal_callouts_dir, + AC_HELP_STRING([--with-hal-callouts-dir=DIR], + [Directory where HAL expects its callout scripts to be located + [[default=$libdir/hal]]]), + [halcalloutsdir="$withval"], + [halcalloutsdir="$libdir/hal"]) +HAL_CALLOUTS_DIR=${halcalloutsdir} +AC_SUBST(HAL_CALLOUTS_DIR) + +AC_ARG_WITH(hal_fdi_dir, + AC_HELP_STRING([--with-hal-fdi-dir=DIR], + [Directory where HAL expects its fdi files to be located + [[default=$datadir/hal/fdi/policy/20thirdparty]]]), + [halfdidir="$withval"], + [halfdidir="$datadir/hal/fdi/policy/20thirdparty"]) +HAL_FDI_DIR=${halfdidir} +AC_SUBST(HAL_FDI_DIR) + # Checks for extensions XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) @@ -101,4 +127,4 @@ AC_HEADER_STDC XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION -AC_OUTPUT([Makefile shared/Makefile src/Makefile man/Makefile]) +AC_OUTPUT([Makefile shared/Makefile src/Makefile tools/Makefile fdi/Makefile man/Makefile]) |