[xorg-commit-diffs] xc/lib Imakefile,1.1.4.2.6.2,1.1.4.2.6.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/lib
In directory pdx:/tmp/cvs-serv13014/lib

Modified Files:
      Tag: XORG-RELEASE-1
	Imakefile 
Log Message:
 70. Merging in the TM branch (Egbert Eich).



Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/Imakefile,v
retrieving revision 1.1.4.2.6.2
retrieving revision 1.1.4.2.6.3
diff -u -d -r1.1.4.2.6.2 -r1.1.4.2.6.3
--- a/Imakefile	4 Mar 2004 17:46:25 -0000	1.1.4.2.6.2
+++ b/Imakefile	2 Apr 2004 21:47:11 -0000	1.1.4.2.6.3
@@ -144,7 +144,7 @@
 ZLIBDIR = zlib
 #endif
 
-#if defined(XFree86Version) && !HasPosixRegex
+#if (defined(XFree86Version) || defined(XorgVersion)) && !HasPosixRegex
 REGEXDIR = regex
 #endif