# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1233194933 18000
# Node ID 53fb843ca4984daa89169f8a16c7390a01b66583
# Parent  640b5d25ac19328a593f2f0099d77c2803ec28bf
configure.in (REGEX_LIBS): undo part of previous change

diff -r 640b5d25ac19 -r 53fb843ca498 ChangeLog
--- a/ChangeLog	Wed Jan 28 18:59:44 2009 -0500
+++ b/ChangeLog	Wed Jan 28 21:08:53 2009 -0500
@@ -1,8 +1,7 @@
 2009-01-28  John W. Eaton  <jwe@octave.org>
 
 	* configure.in: Check to see that pcre library has pcre_compile
-	function.  Don't check for other regex functions is pcre library
-	is found.
+	function.
 
  	* configure.in (SHLLIBPRE, SHLBINPRE): New variables.  AC_SUBST them.
  	(*-*-cygwin*): Set LIBPRE and SHLBINPRE to cyg and SHLLIBPRE to lib.
diff -r 640b5d25ac19 -r 53fb843ca498 configure.in
--- a/configure.in	Wed Jan 28 18:59:44 2009 -0500
+++ b/configure.in	Wed Jan 28 21:08:53 2009 -0500
@@ -457,8 +457,10 @@
 WITH_PCRE="$ac_cv_pcre_h_macros_present"
 
 REGEX_LIBS=
+
 using_pcre=no
 using_regex=no
+
 if test "$WITH_PCRE" = yes; then
   if test "$WITH_PCRE_CONFIG" = yes; then
     REGEX_LIBS=$(pcre-config --libs)
@@ -478,16 +480,16 @@
   AC_MSG_WARN($warn_pcre)
 fi
 
-if test "$using_pcre" = no; then
-  AC_CHECK_FUNCS(regexec, [using_regex=yes], [
-    AC_CHECK_LIB(regex, regexec, [using_regex=yes
-      REGEX_LIBS="-lregex"], [
+AC_CHECK_FUNCS(regexec, [using_regex=yes], [
+  AC_CHECK_LIB(regex, regexec, [using_regex=yes
+    REGEX_LIBS="-lregex $REGEX_LIBS"], [
       warn_regex="regular expression functions not found.  The regular expression matching functions will be disabled."
       AC_MSG_WARN($warn_regex)])])
-  if test "$using_regex" = yes; then
-    AC_DEFINE(HAVE_REGEX, 1, [Define if regex library is available.])
-  fi
+
+if test "$using_regex" = yes; then
+  AC_DEFINE(HAVE_REGEX, 1, [Define if regex library is available.])
 fi
+
 AC_SUBST(REGEX_LIBS)
 
 ### Check for ZLIB library.