Hi, This is the patch for this issue I'll push for inclusion to the next release. If there's a possibility to test this outside my system I'd appreciated it.
I'm sorry for not doing it right the first time. [PATCH] Fix configure misses when compiling on an incomplete installation. Use the argument to --with-xmoduledir before the default module installation directories, also remove all additional checks on the --enable-dlloader option so it can be forced. /Magnus V
From 0d1b722597e9dc56c2cf12f621c545f0c3717d04 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Magnus=20Vigerl=C3=B6f?= <[EMAIL PROTECTED]> Date: Sun, 18 May 2008 13:37:07 +0200 Subject: [PATCH] Fix configure misses when compiling on an incomplete installation. Use the argument to --with-xmoduledir before the default module installation directories, also remove all additional checks on the --enable-dlloader option so it can be forced. --- configure.in | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index af9ac0e..7978dda 100644 --- a/configure.in +++ b/configure.in @@ -837,12 +837,12 @@ WCM_MODDIR= AC_ARG_WITH(xmoduledir, AC_HELP_STRING([--with-xmoduledir], [Specify wacom_drv path explicitly. Implies --enable-dlloader]), WCM_MODDIR="$withval") -if test -d $WCM_XLIB_DIR/xorg/modules/input; then +if test -n "$WCM_MODDIR"; then + : +elif test -d $WCM_XLIB_DIR/xorg/modules/input; then WCM_MODDIR=$WCM_XLIB_DIR/xorg/modules/input elif test -d $WCM_XLIB_DIR/modules/input; then WCM_MODDIR=$WCM_XLIB_DIR/modules/input -elif -z "$WCM_MODDIR"; then - WCM_OPTION_DLLOADER=no fi AC_MSG_RESULT($WCM_MODDIR) @@ -852,13 +852,6 @@ AC_MSG_CHECKING(for dynamic driver loading support) AC_ARG_ENABLE(dlloader, AC_HELP_STRING([--enable-dlloader], [Use dlloader [[default=usually]]]), WCM_OPTION_DLLOADER=$enableval) -if test "$WCM_OPTION_DLLOADER" = yes; then - if test -f $WCM_MODDIR/evdev_drv.so -o -f $WCM_MODDIR/kbd_drv.so -o -f $WCM_MODDIR/mouse_drv.so; then - WCM_OPTION_DLLOADER=yes - else - WCM_OPTION_DLLOADER=no - fi -fi AC_MSG_RESULT($WCM_OPTION_DLLOADER) AM_CONDITIONAL(WCM_DLLOADER, test "$WCM_OPTION_DLLOADER" == "yes") -- 1.5.2.5
signature.asc
Description: This is a digitally signed message part.
