On Sun, Dec 17, 2017 at 03:54:11PM -0800, Jason Gerecke wrote: > On Sun, Dec 17, 2017 at 3:34 PM, Peter Hutterer > <peter.hutte...@who-t.net> wrote: > > On Fri, Dec 15, 2017 at 11:48:50AM -0800, Jason Gerecke wrote: > >> RHEL6/CentOS6 use HAL as an Xorg configuration database instead of the > >> more modern xorg.conf.d mechanism. Our driver currently detects that > >> the X xserver supports xorg.conf.d on these distributions and so prefers > >> to install the associated config file rather than using HAL fdi files. > >> There's no particular reason we can't install both since the X server > >> on these distributions support both, so this commit adds the ability > >> to detect when HAL is present and automatically installs its files. > > > > Did this come from a real-world bug? Since RHEL6.2 we also support > > xorg.conf.d and that will override whatever the fdi configuration sets > > anyway. And installing both is a really bad idea imo, because changing one > > may not have any effect on the real configuration, just adding to user > > confusion. > > > > Cheers, > > Peter > > > > We need to install the fdi file introduced in patch 2 in order to get > touch devices with SW_MUTE_DEVICE to work properly. > > How about something like the following instead: > > if HAS_XORG_CONF_DIR > dist_config_DATA = 70-wacom.conf > else > fdipolicydir = $(datadir)/hal/fdi/policy/20thirdparty > dist_fdipolicy_DATA = wacom.fdi > endif > > if USE_HAL_FDI > fdipreprobedir = $(datadir)/hal/fdi/preprobe/20thirdparty > dist_fdipreprobe_DATA = wacom-preprobe.fdi > endif
Yeah, I think something along those lines is acceptable. Not ideal, but we've left that behind a long time ago ;) Cheers, Peter > > Jason > --- > Now instead of four in the eights place / > you’ve got three, ‘Cause you added one / > (That is to say, eight) to the two, / > But you can’t take seven from three, / > So you look at the sixty-fours.... > > >> --- > >> conf/Makefile.am | 8 +++++--- > >> configure.ac | 15 +++++++++++++++ > >> 2 files changed, 20 insertions(+), 3 deletions(-) > >> > >> diff --git a/conf/Makefile.am b/conf/Makefile.am > >> index f7abdd0..5db206e 100644 > >> --- a/conf/Makefile.am > >> +++ b/conf/Makefile.am > >> @@ -2,9 +2,11 @@ CLEANFILES= > >> > >> if HAS_XORG_CONF_DIR > >> dist_config_DATA = 70-wacom.conf > >> -else > >> -fdidir = $(datadir)/hal/fdi/policy/20thirdparty > >> -dist_fdi_DATA = wacom.fdi > >> +endif > >> + > >> +if USE_HAL_FDI > >> +fdipolicydir = $(datadir)/hal/fdi/policy/20thirdparty > >> +dist_fdipolicy_DATA = wacom.fdi > >> endif > >> > >> if HAVE_SYSTEMD_UNIT_DIR > >> diff --git a/configure.ac b/configure.ac > >> index b17cbe0..71ec76a 100644 > >> --- a/configure.ac > >> +++ b/configure.ac > >> @@ -107,6 +107,21 @@ AC_ARG_WITH([xorg-conf-dir], > >> AC_SUBST(configdir) > >> AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$configdir" != "x"]) > >> > >> +AC_ARG_ENABLE(hal-fdi, AS_HELP_STRING([--enable-hal-fdi], > >> + [Install HAL fdi configuration files (default: > >> auto)]), > >> + [USE_HAL_FDI=$enableval], > >> + [USE_HAL_FDI=auto]) > >> +if test "x$USE_HAL_FDI" = xauto ; then > >> + AC_CHECK_PROG([LSHAL], [lshal], [yes], [no]) > >> + AC_CHECK_PROG([HAL_SET_PROPERTY], [hal-set-property], [yes], [no]) > >> + AS_IF([test "x$LSHAL" = "xyes" -a "x$HAL_SET_PROPERTY" = "xyes"], > >> + [USE_HAL_FDI=yes], > >> + [USE_HAL_FDI=no]) > >> +fi > >> +AC_MSG_CHECKING([if HAL files should be installed]) > >> +AC_MSG_RESULT($USE_HAL_FDI) > >> +AM_CONDITIONAL(USE_HAL_FDI, [test "x$USE_HAL_FDI" = xyes]) > >> + > >> AC_ARG_ENABLE(fuzz-interface, AS_HELP_STRING([--enable-fuzz-interface], > >> [Enable xsetwacom to take NUL-separated > >> commands from stdin (default: no)]), > >> [FUZZINTERFACE=$enableval], > >> -- > >> 2.15.1 > >> > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
