# HG changeset patch
# User jwe
# Date 1134611137 0
# Node ID 6dbb3f6d005488ef8f960b1124335f13a2e0dc4f
# Parent  3d9ddfdc6d3ec78e3158651db1630bffad2bc616
[project @ 2005-12-15 01:40:58 by jwe]

diff -r 3d9ddfdc6d3e -r 6dbb3f6d0054 ChangeLog
--- a/ChangeLog	Thu Dec 15 01:29:34 2005 +0000
+++ b/ChangeLog	Thu Dec 15 01:45:37 2005 +0000
@@ -1,3 +1,7 @@
+2005-12-14  David Bateman  <dbateman@free.fr>
+
+	* Makeconf.in: New tests of regex and pcre.
+
 2005-12-13  John W. Eaton  <jwe@octave.org>
 
 	* examples/Makefile.in (install install-strip): Fix typo.
diff -r 3d9ddfdc6d3e -r 6dbb3f6d0054 Makeconf.in
--- a/Makeconf.in	Thu Dec 15 01:29:34 2005 +0000
+++ b/Makeconf.in	Thu Dec 15 01:45:37 2005 +0000
@@ -191,6 +191,7 @@
 LIBREADLINE = @LIBREADLINE@
 TERMLIBS = @TERMLIBS@
 
+REGEX_LIBS = @REGEX_LIBS@
 BLAS_LIBS = @BLAS_LIBS@
 FFTW_LIBS = @FFTW_LIBS@
 GLPK_LIBS = @GLPK_LIBS@
diff -r 3d9ddfdc6d3e -r 6dbb3f6d0054 configure.in
--- a/configure.in	Thu Dec 15 01:29:34 2005 +0000
+++ b/configure.in	Thu Dec 15 01:45:37 2005 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.493 $)
+AC_REVISION($Revision: 1.494 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -418,6 +418,37 @@
   ;;
 esac
 
+### Check for pcre/regex library.
+AC_SUBST(REGEX_LIBS)
+WITH_PCRE_CONFIG=no
+AC_CHECK_HEADER(pcre.h, WITH_PCRE=yes, WITH_PCRE=no)
+if test $WITH_PCRE = no ; then
+  AC_CHECK_PROG(WITH_PCRE_CONFIG, pcre-config, yes, no)
+  if test $WITH_PCRE_CONFIG = yes ; then
+    WITH_PCRE=yes
+  fi
+fi
+if test $WITH_PCRE = yes ; then
+  AC_CHECK_LIB(pcre, pcre_compile, WITH_PCRE=yes, WITH_PCRE=no)
+  if test $WITH_PCRE = yes ; then
+    AC_DEFINE(HAVE_PCRE, 1, [Define if PCRE is available.])
+    if test $WITH_PCRE_CONFIG = yes ; then
+      REGEX_LIBS=`pcre-config --cflags --libs`
+    else
+      REGEX_LIBS="-lpcre"
+    fi
+  fi
+fi
+AC_CHECK_FUNCS(regexec, WITH_REGEX=yes , [
+  AC_CHECK_LIB(regex, regexec, WITH_REGEX=yes, WITH_REGEX=no)])
+if test $WITH_REGEX = yes ; then
+  AC_DEFINE(HAVE_REGEX, 1, [Define if regex is available.])
+  if test $HAVE_PCRE = no ; then
+    AC_CHECK_FUNCS(regexec, REGEX_LIBS= , [
+      AC_CHECK_LIB(regex, regexec, REGEX_LIBS="-lregex")])
+  fi
+fi
+
 ### Check for ZLIB library.
 
 WITH_ZLIB=true
diff -r 3d9ddfdc6d3e -r 6dbb3f6d0054 scripts/Makefile.in
--- a/scripts/Makefile.in	Thu Dec 15 01:29:34 2005 +0000
+++ b/scripts/Makefile.in	Thu Dec 15 01:45:37 2005 +0000
@@ -32,7 +32,7 @@
 SUBDIRS = audio control deprecated elfun finance general image io \
 	linear-algebra miscellaneous optimization plot polynomial \
 	quaternion set signal sparse specfun special-matrix startup \
-	statistics strings testfun time
+	statistics strings time
 
 DISTSUBDIRS = $(SUBDIRS)