I haven't had a chance to test this, and I really need to get some sleep
right now, but the patch logic still looks wrong. using --with-xmoduledir
should both override the autodetection _and_ imply --enable-dlloader
(as its help string indicates).
It needs to look more like this again:
dnl Check for xmoduledir
WCM_MODDIR=
AC_MSG_CHECKING(for Wacom X driver module path)
AC_ARG_WITH(xmoduledir,
AC_HELP_STRING([--with-xmoduledir], [Specify wacom_drv path explicitly.
Implies --enable-dlloader]),
[
WCM_MODDIR="$withval"
])
if test -n "$WCM_MODDIR"; then
WCM_OPTION_DLLOADER=yes
elif test -d $WCM_XLIBDIR/xorg/modules/input; then
WCM_MODDIR=$WCM_XLIBDIR/xorg/modules/input
elif test -d $WCM_XLIBDIR/modules/input; then
WCM_MODDIR=$WCM_XLIBDIR/modules/input
fi
AC_MSG_RESULT($WCM_MODDIR)
dnl Check for dlloader
AC_ARG_ENABLE(dlloader,
AC_HELP_STRING([--enable-dlloader], [Use dlloader [[default=usually]]]),
, enable_dlloader=$WCM_OPTION_DLLOADER)
#defined case
if test "$enable_dlloader" = "yes"; then
WCM_OPTION_DLLOADER=yes
else
WCM_OPTION_DLLOADER=no
fi
#usual case
if test x$enable_dlloader == x"" && test $WCM_OPTION_DLLOADER != "yes"; then
if test -f $WCM_MODDIR/wacom_drv.so; then
WCM_OPTION_DLLOADER=yes
else
WCM_OPTION_DLLOADER=no
fi
fi
Note that we set WCM_OPTION_DLLOADER if WCM_MODDIR is set, and carry that
forward as the default for the enable_dlloader test. About the only thing
that looks wrong above is the automagic test that depends on wacom_drv.so
already being where it expects to install wacom_drv.so for the test to work.
That should probably be changed to glob *.so, or something else that X is
_sure_ to have put there... but the option logic needs to work as above.
There was discussion and full rationale for this the last time we did it.
It should be in the linuxwacom-discuss archives if this isn't sufficient.
I don't know what else you were trying to change here, and the commit message
just says "rework" it, but I don't see anything that suggests a need to
change the option semantics from the code above, do you?
Oh wait, I see, you've moved WCM_OPTION_DLLOADER=yes to an unconditonal
test outside all of this... Ok, gotta sleep, but please let's start with
the above as a known working reference then try to figure out what it was
that you really wanted to change from that ...
Thanks for the quick response though ...
Ron
On Sun, May 18, 2008 at 01:45:01PM +0200, Magnus Vigerlöf wrote:
> 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
>
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
