util-macros fix for cross compiliation

Joerg Sonnenberger joerg at britannica.bec.de
Wed Aug 15 10:22:26 PDT 2007


Hi,
can someone commit the attached patch?

It disables the check for the SGML tools if cross-compilation is active.
AC_CHECK_FILE as macro can't be used directly as it explicitly bails out
for cross-compilation. This affects xorg-server and and many drivers.

A general plea to all maintainers of a sub-component: please always
UPDATE this package before building packages. It just increases the
maintainance burden if a new xorg-server release still needs the man
suffix override.

Joerg
-------------- next part --------------
$NetBSD: patch-aa,v 1.1 2007/08/06 15:27:07 joerg Exp $

--- xorg-macros.m4.in.orig	2006-11-08 15:23:10.000000000 +0100
+++ xorg-macros.m4.in
@@ -194,7 +194,8 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
 XORG_SGML_PATH=$prefix/share/sgml
 HAVE_DEFS_ENT=
 
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+AS_IF([test "$cross_compiling" = no],
+      AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]))
 
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -250,7 +251,8 @@ BUILDPDFDOC=no
 BUILDPSDOC=no
 BUILDHTMLDOC=no
 
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+AS_IF([test "$cross_compiling" = no],
+      AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]))
 
 AC_PATH_PROG(DOCBOOKPS, docbook2ps)
 AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)


More information about the xorg mailing list