From: panne <unknown>
Date: Mon, 18 Aug 2003 13:15:56 +0000 (+0000)
Subject: [project @ 2003-08-18 13:15:53 by panne]
X-Git-Tag: Approx_11550_changesets_converted~563
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=fd87c1f8579dd5c118f1867bac42df86bc04ac54

[project @ 2003-08-18 13:15:53 by panne]
Nuked unused FPTOOLS_REGEX_IN_LIBC test
---

diff --git a/aclocal.m4 b/aclocal.m4
index c339a84..4f3259c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -24,28 +24,6 @@ AC_CHECK_DECLS([altzone], [], [],[#if TIME_WITH_SYS_TIME
 ])# FP_ALTZONE
 
 
-
-dnl *** Does libc contain GNU regex? ***
-dnl 
-AC_DEFUN(FPTOOLS_REGEX_IN_LIBC,
-[AC_CACHE_CHECK([for GNU regex in libc], fptools_cv_have_regex,
-[AC_TRY_LINK([#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <regex.h>
-],[ struct re_pattern_buffer patbuf; 
-    re_compile_pattern("",0,&patbuf);
-    re_search_2 (&patbuf, "", 0, "",0, 0,0,0,0); ],
-fptools_cv_have_regex=yes, fptools_cv_have_regex=no)])
-if test "$fptools_cv_have_regex" = yes; then
-	HaveGNURegex=YES
-else
-	HaveGNURegex=NO
-fi
-AC_SUBST(HaveGNURegex)
-])
-
-
 dnl ** check for leading underscores in symbol names
 dnl 
 dnl Test for determining whether symbol names have a leading
diff --git a/configure.ac b/configure.ac
index f42c611..4f1e152 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1080,9 +1080,6 @@ AC_MSG_ERROR([You need to install libgmp (the in-tree version does not work on I
 fi;
 fi;
 
-dnl ** check whether this machine has GNU regex in libc.
-FPTOOLS_REGEX_IN_LIBC
-
 dnl ** check whether this machine has BFD and liberty installed (used for debugging)
 dnl    the order of these tests matters: bfd needs liberty
 AC_CHECK_LIB(iberty, xmalloc)
diff --git a/mk/config.mk.in b/mk/config.mk.in
index ddfce03..5572f93 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -696,11 +696,10 @@ HaveLibMingwEx	= @HaveLibMingwEx@
 HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
 
 #-----------------------------------------------------------------------------
-# Regex libraries
+# Regex library
 # (if present in libc use that one, otherwise use the one in the tree)
 #
 HavePosixRegex  = @HavePosixRegex@
-HaveGNURegex	= @HaveGNURegex@
 
 #-----------------------------------------------------------------------------
 # GTK+