On Wed, Jul 20, 2011 at 3:13 PM, Robert Schwebel
<[email protected]> wrote:
> Hi,
>
> Michael applied this patch, but it has an issue:
>
> On Fri, Jul 15, 2011 at 09:16:35PM -0400, Jon Ringle wrote:
>> --disable-action_modeswitch is needed when UDEV_EXPERIMENTAL is not defined
>>
>> Signed-off-by: Jon Ringle <[email protected]>
>> ---
>>  rules/udev.in   |    8 ++++++++
>>  rules/udev.make |   12 ++++++++++++
>>  2 files changed, 20 insertions(+), 0 deletions(-)
>>
>> diff --git a/rules/udev.in b/rules/udev.in
>> index 089a8f5..27fb3c3 100644
>> --- a/rules/udev.in
>> +++ b/rules/udev.in
>> @@ -9,6 +9,7 @@ menuconfig UDEV
>>       select ACL              if UDEV_EXTRA_UDEV_ACL
>>       select USBUTILS         if UDEV_EXTRA_USB_DB
>>       select LIBUSB_COMPAT    if UDEV_EXTRA_HID2HCI
>> +     select LIBUSB_COMPAT    if UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
>>       select PCIUTILS         if UDEV_EXTRA_PCI_DB
>>       help
>>         udev provides a dynamic device directory containing only the files 
>> for
>> @@ -212,6 +213,13 @@ if UDEV_EXTRAS
>>               help
>>                 Keymap support
>>
>> +     config UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
>> +             bool
>> +             depends on !UDEV_EXPERIMENTAL
>> +             prompt "mobile-action-modeswitch"
>> +             help
>> +               Option UMTS Modem support
>> +
>>       config UDEV_EXTRA_PATH_ID
>>               bool
>>               prompt "path_id"
>> diff --git a/rules/udev.make b/rules/udev.make
>> index 3346159..bbefc70 100644
>> --- a/rules/udev.make
>> +++ b/rules/udev.make
>> @@ -131,6 +131,12 @@ UDEV_AUTOCONF    += --enable-edd
>>  else
>>  UDEV_AUTOCONF        += --disable-edd
>>  endif
>> +
>> +ifdef PTXCONF_UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
>> +UDEV_AUTOCONF        += --enable-action_modeswitch
>> +else
>> +UDEV_AUTOCONF        += --disable-action_modeswitch
>> +endif
>>  endif
>
> For the non-experimental udev version, this isn't defined, so it gets
> the non-existing configure option, which ends up with an error. Fixed in
> ptxdist master.

Yeah, my original patch had it correct I think :). I wasn't sure why
mol moved it outside of the ifdef UDEV_EXPERIMENTAL section I had it.

Jon

-- 
ptxdist mailing list
[email protected]

Reply via email to