Updated PCRE used for win32 builds.

As of PCRE 8.33, config.h.generic no longer contains boolean macros.  Two
of them (SUPPORT_PCRE8 and HAVE_MEMMOVE) were added to appropriate makefiles.
This allows PCRE 8.33 to compile and don't change anything for previous
versions.

diff --git a/auto/lib/pcre/makefile.bcc b/auto/lib/pcre/makefile.bcc
index 1c140d668b7f8d75c733b718e148ccbe8f824273..7230f32053345579bd3668a2410182505a898fb7 100644 (file)
--- a/auto/lib/pcre/makefile.bcc
+++ b/auto/lib/pcre/makefile.bcc
@@ -4,7 +4,8 @@
 
 
 CFLAGS =       -q -O2 -tWM -w-8004 $(CPU_OPT)
-PCREFLAGS =    -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
+PCREFLAGS =    -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 \
+               -DSUPPORT_PCRE8 -DHAVE_MEMMOVE
 
 
 pcre.lib:

diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc
index 7a8da7158181ee17fbac913fcc474052167021f5..07fd9a2853ae5f7310323cd54e3019947988d1ff 100644 (file)
--- a/auto/lib/pcre/makefile.msvc
+++ b/auto/lib/pcre/makefile.msvc
@@ -4,7 +4,8 @@
 
 
 CFLAGS =       -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
-PCREFLAGS =    -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
+PCREFLAGS =    -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 \
+               -DSUPPORT_PCRE8 -DHAVE_MEMMOVE
 
 
 pcre.lib:

diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc
index bfb692068792c216175a42afa1cd3566d41bbb8c..78f5257b3e6fc5f4e489d2796faa35f66c625958 100644 (file)
--- a/auto/lib/pcre/makefile.owc
+++ b/auto/lib/pcre/makefile.owc
@@ -4,7 +4,8 @@
 
 
 CFLAGS =       -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
-PCREFLAGS =    -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
+PCREFLAGS =    -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 \
+               -DSUPPORT_PCRE8 -DHAVE_MEMMOVE
 
 
 pcre.lib:

diff --git a/misc/GNUmakefile b/misc/GNUmakefile
index 0887398eba7d1824dbf86cd5cad05d171a07d87b..a190b453c2fcc2206381bc43733badd57be25fc6 100644 (file)
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -7,7 +7,7 @@ TEMP =          tmp
 OBJS =         objs.msvc8
 OPENSSL =      openssl-1.0.1e
 ZLIB =         zlib-1.2.8
-PCRE =         pcre-8.32
+PCRE =         pcre-8.33
 
 
 release: export