xf86-input-evdev: Changes to 'master'

Paulo César Pereira de Andrade pcpa at mandriva.com.br
Mon Feb 2 18:35:14 PST 2009


Dan Nicholson wrote:
>> diff --git a/configure.ac b/configure.ac
>> index 4ba5a8a..809799f 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -72,19 +73,22 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
>> # Checks for pkg-config packages
>> PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
>> -sdkdir=$(pkg-config --variable=sdkdir xorg-server)
>> +XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
>> +sdkdir=$(pkg-config --variable=sdkdir xorg-server |
>> + sed -e 's@/usr/include@$(includedir)@')
>> AC_SUBST(sdkdir)
>
> The sdkdir handling breaks installation of the properties header. This
> is wrong on many levels. If you want to fix distcheck, please do it
> like we talked about for the app-defaults directory.
>
> configure.ac:
> AC_ARG_WITH([sdkdir],
>     [AC_HELP_STRING([--with-sdkdir],[the xserver SDK directory
> (default: from pkg-config)])],
>     [sdkdir="$withval"],
>     [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`])
> AC_SUBST([sdkdir])
>
> Makefile.am:
> DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'

  You are right. It was naive of me to only test with --prefix=/usr

  But I think a better approach should be found for pkg-config
variables, as creating a configure option is basically only to
correct make distcheck.

Paulo




More information about the xorg mailing list