From: simonmar <unknown>
Date: Thu, 14 Feb 2002 14:08:25 +0000 (+0000)
Subject: [project @ 2002-02-14 14:08:25 by simonmar]
X-Git-Tag: nhc98-1-18-release~1109
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=73a8949c0dff163dada1374a13b6faabc32711b4;p=ghc-base.git

[project @ 2002-02-14 14:08:25 by simonmar]
Use cbits/regex if the system doesn't have a POSIX-compatible regular
expression library.
---

diff --git a/Makefile b/Makefile
index 47276f3..5f81619 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.16 2002/02/13 11:51:40 simonmar Exp $
+# $Id: Makefile,v 1.17 2002/02/14 14:08:25 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -39,13 +39,15 @@ ALL_DIRS = \
 
 PACKAGE = base
 
-ifneq "$(HavePosixRegex)" "YES"
-EXCLUDED_SRCS += Text/Regex/Posix.hsc Text/Regex.hs
-endif
-
 SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude
 SRC_HSC2HS_OPTS += -Iinclude
 
+# Make sure we can get hold of regex.h
+ifneq "$(HavePosixRegex)" "YES"
+SRC_HC_OPTS     += -Icbits/regex
+SRC_HSC2HS_OPTS += -Icbits/regex
+endif
+
 # -----------------------------------------------------------------------------
 # Per-module flags