diff --git a/aclocal.m4 b/aclocal.m4
index f5485cc5a2773bbca4190a8ef830f7c805ce01d0..7dc2e4d508b8179a79ef2f6e03ac5f24fad8af4a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.93 2002/01/17 09:52:18 sof Exp $
+dnl $Id: aclocal.m4,v 1.94 2002/02/13 11:51:40 simonmar Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -86,11 +86,11 @@ AC_DEFUN(FPTOOLS_REGEX_IN_LIBC,
     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
-	HaveRegex=YES
+	HaveGNURegex=YES
 else
-	HaveRegex=NO
+	HaveGNURegex=NO
 fi
-AC_SUBST(HaveRegex)
+AC_SUBST(HaveGNURegex)
 ])
 
 
diff --git a/configure.in b/configure.in
index e03022321f6421d6b19816c6ec42ef1009902dfe..b8bc4411693eae61092d4f3ebfa443b2b7864228 100644
--- a/configure.in
+++ b/configure.in
@@ -699,6 +699,11 @@ AC_CHECK_HEADER(alloc.h,AC_CHECK_FUNCS(farcalloc))
 dnl ** check for valloc (in sunos, solaris, mips, amiga, next, minix, ultrix)
 AC_CHECK_HEADER(malloc.h,AC_CHECK_FUNCS(valloc))
 
+dnl ** check for POSIX regex
+HavePosixRegex=NO
+AC_CHECK_HEADER(regex.h,AC_CHECK_FUNC(regcomp, HavePosixRegex=YES))
+AC_SUBST(HavePosixRegex)
+
 dnl ** how do we get a timezone name, and UTC offset ?
 AC_STRUCT_TIMEZONE
 
diff --git a/mk/config.mk.in b/mk/config.mk.in
index a4f8f70f275f5787d303e5c1d48b6175b1bd9205..3dc1f9efc37970b61a26b326593b2edbbc1b5bc3 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -650,10 +650,11 @@ HaveLibGmp	= @HaveLibGmp@
 LibGmp		= @LibGmp@
 
 #-----------------------------------------------------------------------------
-# Regex library 
+# Regex libraries
 # (if present in libc use that one, otherwise use the one in the tree)
 #
-HaveRegex	= @HaveRegex@
+HavePosixRegex  = @HavePosixRegex@
+HaveGNURegex	= @HaveGNURegex@
 
 #-----------------------------------------------------------------------------
 # GTK+