[PATCH] util-macros: linuxdoc + crosscompile fix

Enrico Weigelt weigelt at metux.de
Thu Jun 1 15:04:26 PDT 2006


Hi folks,


Here's a patch which fixes problems in the XORG_CHECK_LINUXDOC 
macro (used ie. by the Xserver) while crosscompiling: 
This macro calls AC_CHECK_FILE, which refuses to work when 
crosscompiling.

My solution is to skip this check while crosscompiling and
simply disable the whole linuxdoc building.


cu
-- 
---------------------------------------------------------------------
 Enrico Weigelt    ==   metux IT service - http://www.metux.de/
---------------------------------------------------------------------
 Please visit the OpenSource QM Taskforce:
 	http://wiki.metux.de/public/OpenSource_QM_Taskforce
 Patches / Fixes for a lot dozens of packages in dozens of versions:
	http://patches.metux.de/
---------------------------------------------------------------------
-------------- next part --------------
diff -ruN util-macros-1.0.1.orig/xorg-macros.m4 util-macros-1.0.1/xorg-macros.m4
--- util-macros-1.0.1.orig/xorg-macros.m4	Thu Jun  1 22:17:31 2006
+++ util-macros-1.0.1/xorg-macros.m4	Thu Jun  1 22:23:02 2006
@@ -181,12 +181,16 @@
 # Whether or not the necessary tools and files are found can be checked
 # with the AM_CONDITIONAL "BUILD_LINUXDOC"
 AC_DEFUN([XORG_CHECK_LINUXDOC],[
+if test "$cross_compiling" == "yes" ; then
+    AC_MSG_RESULT([WARN: LINUXDOC not available while crosscompiling])
+    DEFS_ENT_PATH=
+else
 AC_CHECK_FILE(
 	[$prefix/share/X11/sgml/defs.ent], 
 	[DEFS_ENT_PATH=$prefix/share/X11/sgml],
 	[DEFS_ENT_PATH=]
 )
-
+fi
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
 


More information about the xorg mailing list