xf86-input-evdev: Changes to 'master'

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


Peter Hutterer wrote:
> On Tue, Feb 03, 2009 at 12:35:14AM -0200, Paulo César Pereira de Andrade
> wrote:
>> 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.
>
> can you please explain what's wrong with make distcheck that it requires
> fixing?

  make distcheck can be seen as a test of a build and install in
a controlled environment. It checks if the tarball contains all
the files required to build the package, among other tests.

  The problem in the xf86-input-evdev was it attempting to install
files outside of DESTDIR. Actually, if you run make distcheck as
root user, it will work. As will it work if you specify a wrong
destdir but with correct permissions (usually a path not starting
with / and installing in the build directory), and not cause any
warnings.

  The problen Dan is talking about is that the patch I made was
wrong and would only work with something like
% ./autogen.sh --prefix=/usr
because it broke both normal make install and make distcheck for
other prefixes.

Paulo




More information about the xorg mailing list