head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q1:1.1.0.18
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.16
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.14
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.12
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.10
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.8
	pkgsrc-2008Q1:1.1.0.6
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.4
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.2
	pkgsrc-2007Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2009.05.18.18.16.15;	author hasso;	state dead;
branches;
next	1.1;

1.1
date	2007.08.06.15.27.07;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 1.2.1.

Changes in 1.2.0:
Peter Breitenlohner (5):
      reorganize autoconf macro files
      define and use XORG_CHANGELOG macro
      define XORG_CWARNFLAGS macro
      fix XORG_PROG_RAWCPP for cygwin
      bump to 1.2.0

Changes in 1.2.1:
Alan Coopersmith (3):
      Allow setting XORG_SGML_PATH to a non-default path when running configure
      Replace gitweb URL with cgit URL in README
      Version bump: 1.2.1

Matthieu Herrb (2):
      Fix CWARNFLAGS for gcc versions < 4
      use more CWARNFLAGS with gcc 3.4 too.

Peter Breitenlohner (1):
      fix distcheck target
@
text
@$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)
@


1.1
log
@Add patch to allow cross-compilation of packaging using the
LINUXDOC macro. Bump revision.
@
text
@d1 1
a1 1
$NetBSD$
@