On Wed, Feb 04, 2009 at 05:48:01PM -0200, Paulo César Pereira de Andrade wrote: > These cases should really be addressed in a different > way, as the addition of a option that is only useful to > pass distcheck is wrong. > > Another "cosmetic" thing that should be addressed is > usage of something like: > PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) > AC_SUBST(XORG_CFLAGS) > > First the automake macro says: > > Checking for XORG... yes > > while it should say something more like: > > Checking for xorg-server... > Checking for xproto... > > or maybe in the same line, but not really a xorg issue, > but a pkg-config issue?
I'll merge such a patch if you have one for me. > From 579e1ebf2431cbb0ea8b0ccb2febe87c6dba88b4 Mon Sep 17 00:00:00 2001 > From: Paulo Cesar Pereira de Andrade <[email protected]> > Date: Wed, 4 Feb 2009 17:13:53 -0200 > Subject: [PATCH] Correct make distchek using the same solution used in other > packages. > > The problem is that the "pattern" substitutions used by automake > don't work very well with "pkg-config --variable" when running > make distcheck. > Every single driver and several applications already uses a similar > solution, sometimes not even using a pkg-config variable, see for > example --with-xorg-module-dir. > --- > Makefile.am | 1 + > configure.ac | 7 +++++-- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 3a59a65..201c284 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -19,6 +19,7 @@ > # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > > AUTOMAKE_OPTIONS = foreign > +DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir=\$${includedir}/xorg > > if BUILD_TEST > test_dir=test > diff --git a/configure.ac b/configure.ac > index 809799f..c54129c 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -74,8 +74,11 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) > # Checks for pkg-config packages > PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) > XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" > -sdkdir=$(pkg-config --variable=sdkdir xorg-server | > - sed -e 's@/usr/incl...@$(includedir)@') > +xorg_sdkdir=$(pkg-config --variable=sdkdir xorg-server) > +AC_ARG_WITH(sdkdir, > + AC_HELP_STRING([--with-sdkdir=<path>], > + [Xorg X Server sdk headers (default is autodetected)]), > + [sdkdir="$withval"], [sdkdir="${xorg_sdkdir}"]) > AC_SUBST(sdkdir) > > # Checks for libraries. > -- > 1.6.1 > _______________________________________________ > xorg mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/xorg > > !DSPAM:4989f100233141970173131! how is this patch different from Dan's patch from two days ago? Cheers, Peter _______________________________________________ xorg mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/xorg
