Commit 21e05da99c made the XKB headers depend on the definition
of _X_NONSTRING added in commit 50671520ef which raised the
version in the xproto.pc to 7.0.33. While this is automatically
handled for those using unmodified upstream xorgproto releases, adding
this may help make it easier to diagnose errors like those reported in
issue #51 where headers are being mixed across releases.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/94>
Currently the pc files define libdir, however they are installed into
/usr/share, which means they should be architecture agnostic. In a
multilib system, xorg-proto built for each multilib abi, the value of
libdir is going to be different. These should either be installed in
<libdir>/pkgconfig or they shouldn't define libdir, espeically since
they don't actually use the definition. This specifically causes an
issue when trying to install both abis at the same time, since they are
not binary identical, something like rpm will complain that they
conflict.
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Just stuff the versions in the .pc file directly, @PACKAGE_VERSION@ is
the version set in configure.ac which is now different.
Signed-off-by: Adam Jackson <ajax@redhat.com>
