Load pcre-3.1 into code/trunk.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@45 2f5784b3-3f2a-0410-8824-cb99058d5e15

9 files changed, 22 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 6da0bbd..c594ab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,17 @@ ChangeLog for PCRE
 ------------------
 
 
+Version 3.1 09-Feb-00
+---------------------
+
+The only change in this release is the fixing of some bugs in Makefile.in for
+the "install" target:
+
+(1) It was failing to install pcreposix.h.
+
+(2) It was overwriting the pcre.3 man page with the pcreposix.3 man page.
+
+
 Version 3.0 01-Feb-00
 ---------------------
 
diff --git a/Makefile.in b/Makefile.in
index 958332c..b837424 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -160,8 +160,9 @@ install:        all
 		$(LIBTOOL) $(INSTALL_DATA) libpcre.$(LIBSUFFIX) $(LIBDIR)/libpcre.$(LIBSUFFIX)
 		$(LIBTOOL) $(INSTALL_DATA) libpcreposix.$(LIBSUFFIX) $(LIBDIR)/libpcreposix.$(LIBSUFFIX)
 		$(INSTALL_DATA) pcre.h $(INCDIR)/pcre.h
+		$(INSTALL_DATA) pcreposix.h $(INCDIR)/pcreposix.h
 		$(INSTALL_DATA) doc/pcre.3 $(MANDIR)/man3/pcre.3
-		$(INSTALL_DATA) doc/pcreposix.3 $(MANDIR)/man3/pcre.3
+		$(INSTALL_DATA) doc/pcreposix.3 $(MANDIR)/man3/pcreposix.3
 		$(INSTALL_DATA) doc/pgrep.1 $(MANDIR)/man1/pgrep.1
 		@if test "$(LIBTOOL)" = "libtool"; then \
 		  echo ' '; \
diff --git a/configure b/configure
index 738230a..9a9f226 100755
--- a/configure
+++ b/configure
@@ -505,8 +505,8 @@ fi
 
 
 PCRE_MAJOR=3
-PCRE_MINOR=0
-PCRE_DATE=01-Feb-2000
+PCRE_MINOR=1
+PCRE_DATE=09-Feb-2000
 PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR}
 
 
diff --git a/configure.in b/configure.in
index 507888b..a947f19 100644
--- a/configure.in
+++ b/configure.in
@@ -17,8 +17,8 @@ dnl digits for minor numbers less than 10. There are unlikely to be
 dnl that many releases anyway.
 
 PCRE_MAJOR=3
-PCRE_MINOR=0
-PCRE_DATE=01-Feb-2000
+PCRE_MINOR=1
+PCRE_DATE=09-Feb-2000
 PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR}
 
 dnl Provide versioning information for libtool shared libraries that
diff --git a/pcretest.c b/pcretest.c
index b9e36e2..85569fb 100644
--- a/pcretest.c
+++ b/pcretest.c
@@ -391,6 +391,7 @@ while (!done)
 
 #if !defined NOPOSIX  /* There are still compilers that require no indent */
   regex_t preg;
+  int do_posix = 0;
 #endif
 
   const char *error;
@@ -402,7 +403,6 @@ while (!done)
   int do_g = 0;
   int do_showinfo = showinfo;
   int do_showrest = 0;
-  int do_posix = 0;
   int erroroffset, len, delimiter;
 
   if (infile == stdin) printf("  re> ");
diff --git a/testdata/testoutput1 b/testdata/testoutput1
index 1a10a74..affb475 100644
--- a/testdata/testoutput1
+++ b/testdata/testoutput1
@@ -1,4 +1,4 @@
-PCRE version 3.0 01-Feb-2000
+PCRE version 3.1 09-Feb-2000
 
 /the quick brown fox/
     the quick brown fox
diff --git a/testdata/testoutput2 b/testdata/testoutput2
index 493f460..d0fc036 100644
--- a/testdata/testoutput2
+++ b/testdata/testoutput2
@@ -1,4 +1,4 @@
-PCRE version 3.0 01-Feb-2000
+PCRE version 3.1 09-Feb-2000
 
 /(a)b|/
 Capturing subpattern count = 1
diff --git a/testdata/testoutput3 b/testdata/testoutput3
index a4a28c1..8eb215e 100644
--- a/testdata/testoutput3
+++ b/testdata/testoutput3
@@ -1,4 +1,4 @@
-PCRE version 3.0 01-Feb-2000
+PCRE version 3.1 09-Feb-2000
 
 /(?<!bar)foo/
     foo
diff --git a/testdata/testoutput4 b/testdata/testoutput4
index 586cbbd..d951b48 100644
--- a/testdata/testoutput4
+++ b/testdata/testoutput4
@@ -1,4 +1,4 @@
-PCRE version 3.0 01-Feb-2000
+PCRE version 3.1 09-Feb-2000
 
 /^[\w]+/
     *** Failers