diff options
author | nigel <nigel@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2007-02-24 21:39:58 +0000 |
---|---|---|
committer | nigel <nigel@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2007-02-24 21:39:58 +0000 |
commit | e27c89c9227398c6feee3ca0748827fd064154cd (patch) | |
tree | fb54a9ea159ba3a883640c969a4c83f768c9a9ba | |
parent | 77c897711a9b8aeb05bbbc34cbf8fac9d4bddebf (diff) | |
download | pcre-e27c89c9227398c6feee3ca0748827fd064154cd.tar.gz |
Load pcre-3.9 into code/trunk.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@61 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | doc/pcregrep.1 | 12 | ||||
-rw-r--r-- | doc/pcregrep.html | 16 | ||||
-rw-r--r-- | doc/pcregrep.txt | 32 | ||||
-rw-r--r-- | testdata/testoutput1 | 2 | ||||
-rw-r--r-- | testdata/testoutput2 | 2 | ||||
-rw-r--r-- | testdata/testoutput3 | 2 | ||||
-rw-r--r-- | testdata/testoutput4 | 2 | ||||
-rw-r--r-- | testdata/testoutput5 | 2 | ||||
-rw-r--r-- | testdata/testoutput6 | 2 |
13 files changed, 32 insertions, 62 deletions
@@ -1,6 +1,16 @@ ChangeLog for PCRE ------------------ +Version 3.0 02-Jan-02 +--------------------- + +1. A bit of extraneous text had somehow crept into the pcregrep documentation. + +2. If --disable-static was given, the building process failed when trying to +build pcretest and pcregrep. (For some reason it was using libtool to compile +them, which is not right, as they aren't part of the library.) + + Version 3.8 18-Dec-01 --------------------- diff --git a/Makefile.in b/Makefile.in index b5348ea..b7e862b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -123,10 +123,10 @@ study.o: $(top_srcdir)/study.c $(top_srcdir)/internal.h \ $(LTCOMPILE) $(UTF8) $(top_srcdir)/study.c pcretest.o: $(top_srcdir)/pcretest.c $(top_srcdir)/internal.h pcre.h config.h Makefile - $(LTCOMPILE) $(UTF8) $(top_srcdir)/pcretest.c + $(CC) -c $(CFLAGS) -I. $(UTF8) $(top_srcdir)/pcretest.c pcregrep.o: $(top_srcdir)/pcregrep.c pcre.h Makefile config.h - $(LTCOMPILE) $(UTF8) $(PCREGREP_OSTYPE) $(top_srcdir)/pcregrep.c + $(CC) -c $(CFLAGS) -I. $(UTF8) $(PCREGREP_OSTYPE) $(top_srcdir)/pcregrep.c # An auxiliary program makes the default character table source @@ -1091,8 +1091,8 @@ rm -f conftest.sh ac_config_headers="$ac_config_headers config.h:config.in" PCRE_MAJOR=3 -PCRE_MINOR=8 -PCRE_DATE=18-Dec-2001 +PCRE_MINOR=9 +PCRE_DATE=02-Jan-2002 PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR} PCRE_LIB_VERSION=0:1:0 diff --git a/configure.in b/configure.in index 630401b..e158d46 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=8 -PCRE_DATE=18-Dec-2001 +PCRE_MINOR=9 +PCRE_DATE=02-Jan-2002 PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR} dnl Provide versioning information for libtool shared libraries that diff --git a/doc/pcregrep.1 b/doc/pcregrep.1 index 2925e99..5d3151e 100644 --- a/doc/pcregrep.1 +++ b/doc/pcregrep.1 @@ -32,17 +32,7 @@ Do not print individual lines; instead just print a count of the number of lines that would otherwise have been printed. If several files are given, a count is printed for each of them. .TP - - versity of Cambridge for use on Unix systems connected to - the Internet. It is freely available under the terms of - the GNU General Public Licence. In style it is similar to - Smail 3, but its facilities are more extensive, and in - particular it has some defences against mail bombs and - unsolicited junk mail, in the form of options for refusing - messages from particular hosts, networks, or senders. - - Exim's command line takes the standard Unix form of a - sequence of options, each starting with a hyphen charac\fB-f\fIfilename\fR +\fB-f\fIfilename\fR Read patterns from the file, one per line, and match all patterns against each line. There is a maximum of 100 patterns. Trailing white space is removed, and blank lines are ignored. An empty file contains no patterns and therefore diff --git a/doc/pcregrep.html b/doc/pcregrep.html index 823b4aa..7bc210c 100644 --- a/doc/pcregrep.html +++ b/doc/pcregrep.html @@ -55,21 +55,7 @@ lines that would otherwise have been printed. If several files are given, a count is printed for each of them. </P> <P> -<PRE> - versity of Cambridge for use on Unix systems connected to - the Internet. It is freely available under the terms of - the GNU General Public Licence. In style it is similar to - Smail 3, but its facilities are more extensive, and in - particular it has some defences against mail bombs and - unsolicited junk mail, in the form of options for refusing - messages from particular hosts, networks, or senders. -</PRE> -</P> -<P> -<PRE> - Exim's command line takes the standard Unix form of a - sequence of options, each starting with a hyphen charac\fB-f<I>filename</I> -</PRE> +\fB-f<I>filename</I> Read patterns from the file, one per line, and match all patterns against each line. There is a maximum of 100 patterns. Trailing white space is removed, and blank lines are ignored. An empty file contains no patterns and therefore diff --git a/doc/pcregrep.txt b/doc/pcregrep.txt index 477e80d..1600228 100644 --- a/doc/pcregrep.txt +++ b/doc/pcregrep.txt @@ -37,30 +37,13 @@ OPTIONS wise have been printed. If several files are given, a count is printed for each of them. - versity of Cambridge for use on Unix systems connected to - the Internet. It is freely available - under the terms of - the GNU General Public Licence. In style it - is similar to - Smail 3, but its facilities are more - extensive, and in - particular it has some defences against - mail bombs and - unsolicited junk mail, in the form of - options for refusing - messages from particular hosts, networks, - or senders. - - Exim's command line takes the standard - - Unix form of a - sequence of options, each starting with a - hyphen charac-ffilename Read patterns from the - file, one per line, and match all patterns against - each line. There is a maximum of 100 patterns. - Trailing white space is removed, and blank lines - are ignored. An empty file contains no patterns - and therefore matches nothing. + -ffilename + Read patterns from the file, one per line, and + match all patterns against each line. There is a + maximum of 100 patterns. Trailing white space is + removed, and blank lines are ignored. An empty + file contains no patterns and therefore matches + nothing. -h Suppress printing of filenames when searching mul- tiple files. @@ -69,6 +52,7 @@ OPTIONS parisons. -l Instead of printing lines from the files, just + print the names of the files containing lines that would have been printed. Each file name is printed once, on a separate line. diff --git a/testdata/testoutput1 b/testdata/testoutput1 index 5fa1e6e..f0047ff 100644 --- a/testdata/testoutput1 +++ b/testdata/testoutput1 @@ -1,4 +1,4 @@ -PCRE version 3.8 18-Dec-2001 +PCRE version 3.9 02-Jan-2002 /the quick brown fox/ the quick brown fox diff --git a/testdata/testoutput2 b/testdata/testoutput2 index e1e60ce..e8844d2 100644 --- a/testdata/testoutput2 +++ b/testdata/testoutput2 @@ -1,4 +1,4 @@ -PCRE version 3.8 18-Dec-2001 +PCRE version 3.9 02-Jan-2002 /(a)b|/ Capturing subpattern count = 1 diff --git a/testdata/testoutput3 b/testdata/testoutput3 index 9e297d5..cbe9aaa 100644 --- a/testdata/testoutput3 +++ b/testdata/testoutput3 @@ -1,4 +1,4 @@ -PCRE version 3.8 18-Dec-2001 +PCRE version 3.9 02-Jan-2002 /(?<!bar)foo/ foo diff --git a/testdata/testoutput4 b/testdata/testoutput4 index 61d0505..df81a0f 100644 --- a/testdata/testoutput4 +++ b/testdata/testoutput4 @@ -1,4 +1,4 @@ -PCRE version 3.8 18-Dec-2001 +PCRE version 3.9 02-Jan-2002 /^[\w]+/ *** Failers diff --git a/testdata/testoutput5 b/testdata/testoutput5 index 9213199..6bb9ad3 100644 --- a/testdata/testoutput5 +++ b/testdata/testoutput5 @@ -1,4 +1,4 @@ -PCRE version 3.8 18-Dec-2001 +PCRE version 3.9 02-Jan-2002 /-- Because of problems with Perl 5.6 in handling UTF-8 vs non UTF-8 --/ /-- strings automatically, do not use the \x{} construct except with --/ diff --git a/testdata/testoutput6 b/testdata/testoutput6 index 8fa6682..fcf0846 100644 --- a/testdata/testoutput6 +++ b/testdata/testoutput6 @@ -1,4 +1,4 @@ -PCRE version 3.8 18-Dec-2001 +PCRE version 3.9 02-Jan-2002 /\x{100}/8DM Memory allocation (code space): 11 |