On Thu, Mar 25, 2010 at 4:12 PM, Yaakov (Cygwin/X) <yselkow...@users.sourceforge.net> wrote: > From: Yaakov Selkowitz <yselkow...@users.sourceforge.net> > > Trying to find X11/defs.ent with AC_CHECK_FILE does not work when > cross-compiling, and the check assumed that xorg-sgml-doctools is > installed to the same prefix which need not always be the case. > > xorg-sgml-doctools 1.4 provides a pkg-config file which we can use > instead, fixing both those cases. This macro is provided in util-macros > instead of with xorg-sgml-doctools, otherwise the latter would become a > hard dependency just to run autoreconf. > > Signed-off-by: Yaakov Selkowitz <yselkow...@users.sourceforge.net> > --- > xorg-macros.m4.in | 54 ++++++++++++++++++++++++++++++++-------------------- > 1 files changed, 33 insertions(+), 21 deletions(-) > > diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in > index 055c83e..916b472 100644 > --- a/xorg-macros.m4.in > +++ b/xorg-macros.m4.in > @@ -178,6 +178,31 @@ AC_SUBST([DRIVER_MAN_DIR]) > AC_SUBST([ADMIN_MAN_DIR]) > ]) # XORG_MANPAGE_SECTIONS > > +# XORG_CHECK_SGML_DOCTOOLS > +# ------------------------ > +# Minimum version: 1.7.0 > +# > +# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent > +# provided by xorg-sgml-doctools, if installed. > +AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ > +AC_MSG_CHECKING([for X.Org SGML entities]) > +XORG_SGML_PATH= > +PKG_CHECK_EXISTS([xorg-sgml-doctools],
This should take an optional version number as an argument in case you need newer doctools or something. I think all it would take is this: PKG_CHECK_EXISTS([xorg-sgml-doctools] m4_ifval([$1], [ >= $1]), ... -- Dan _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel