[project @ 2004-07-23 15:31:59 by ross]

To make Text.Regex.Posix work with Hugs, move cbits/regex/regex.h under
include, where Hugs can find it.

6 files changed, 13 insertions, 11 deletions

diff --git a/libraries/base/Text/Regex/Posix.hsc b/libraries/base/Text/Regex/Posix.hsc
index 56544e15b8..8cda01060f 100644
--- a/libraries/base/Text/Regex/Posix.hsc
+++ b/libraries/base/Text/Regex/Posix.hsc
@@ -19,7 +19,6 @@ module Text.Regex.Posix (
 	-- * The @Regex@ type
 	Regex,	 	-- abstract
 
-#if !defined(__HUGS__) || defined(HAVE_REGEX_H)
 	-- * Compiling a regular expression
 	regcomp, 	-- :: String -> Int -> IO Regex
 
@@ -36,12 +35,19 @@ module Text.Regex.Posix (
 	         	--		 String,     -- everything after match
 	         	-- 	 	 [String]))  -- subexpression matches
 
-#endif
   ) where
 
-#if !defined(__HUGS__) || defined(HAVE_REGEX_H)
 #include <sys/types.h>
+
+#if HAVE_REGEX_H && HAVE_REGCOMP
 #include "regex.h"
+#else
+#include "regex/regex.h"
+{-# CBITS regex/reallocf.c #-}
+{-# CBITS regex/regcomp.c #-}
+{-# CBITS regex/regerror.c #-}
+{-# CBITS regex/regexec.c #-}
+{-# CBITS regex/regfree.c #-}
 #endif
 
 import Prelude
@@ -54,8 +60,6 @@ type CRegex    = ()
 -- | A compiled regular expression
 newtype Regex = Regex (ForeignPtr CRegex)
 
-#if !defined(__HUGS__) || defined(HAVE_REGEX_H)
--- to the end
 -- -----------------------------------------------------------------------------
 -- regcomp
 
@@ -174,5 +178,3 @@ foreign import ccall  unsafe "&regfree"
 foreign import ccall unsafe "regexec"
   c_regexec :: Ptr CRegex -> CString -> CSize
 	    -> Ptr CRegMatch -> CInt -> IO CInt
-
-#endif /* HAVE_REGEX_H */
diff --git a/libraries/base/cbits/regex/regcomp.c b/libraries/base/cbits/regex/regcomp.c
index 4bb3557c34..be9fdfae15 100644
--- a/libraries/base/cbits/regex/regcomp.c
+++ b/libraries/base/cbits/regex/regcomp.c
@@ -49,7 +49,7 @@ static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "regex.h"
+#include "regex/regex.h"
 
 // removed collate stuff --SDM
 // #include "collate.h"
diff --git a/libraries/base/cbits/regex/regerror.c b/libraries/base/cbits/regex/regerror.c
index 4260c47cd7..20816eb770 100644
--- a/libraries/base/cbits/regex/regerror.c
+++ b/libraries/base/cbits/regex/regerror.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
 #include <string.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "regex.h"
+#include "regex/regex.h"
 
 #include "utils.h"
 
diff --git a/libraries/base/cbits/regex/regexec.c b/libraries/base/cbits/regex/regexec.c
index de177d5969..dac0fa7743 100644
--- a/libraries/base/cbits/regex/regexec.c
+++ b/libraries/base/cbits/regex/regexec.c
@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
-#include "regex.h"
+#include "regex/regex.h"
 
 #include "utils.h"
 #include "regex2.h"
diff --git a/libraries/base/cbits/regex/regfree.c b/libraries/base/cbits/regex/regfree.c
index 491b7f7c0c..b46fc4fdbe 100644
--- a/libraries/base/cbits/regex/regfree.c
+++ b/libraries/base/cbits/regex/regfree.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#include "regex.h"
+#include "regex/regex.h"
 
 #include "utils.h"
 #include "regex2.h"
diff --git a/libraries/base/cbits/regex/regex.h b/libraries/base/include/regex/regex.h
index 0c7fe1d24d..0c7fe1d24d 100644
--- a/libraries/base/cbits/regex/regex.h
+++ b/libraries/base/include/regex/regex.h