X-Git-Url: http://www.privoxy.org/gitweb/show-status?a=blobdiff_plain;f=windows%2FMYconfigure;h=00658ed2952d7b25c4e8b38e7c89d3b09b63af14;hb=ba0f8604adf6a9ef25c01ae181638754c49aa969;hp=5acc59dab74bec436c26377215ae930efd15d3fa;hpb=da1e903e244a34c31e9728b80c1a2ce421166aaf;p=privoxy.git

diff --git a/windows/MYconfigure b/windows/MYconfigure
index 5acc59da..00658ed2 100755
--- a/windows/MYconfigure
+++ b/windows/MYconfigure
@@ -20,6 +20,7 @@ fi
 # --enable-mingw32                Use mingw32 for a Windows GUI
 # --enable-static-linking         Use static linking instead of dynamic linking (and not have
 #                                 to put all the .DLLs in the path or the same dir as Privoxy)
+# --disable-pcre2                 Don't try to use the pcre2 library even if it's available
 # --disable-pthread               Use native threads instead of POSIX pthreads library
 # --disable-dynamic-pcre          Use the built-in, static pcre, even if libpcre is available
 # --with-docbook=yes              Enable docbook documentation creation
@@ -38,6 +39,11 @@ export LDFLAGS=""
 # start with initially empty flags
 
 
+CFLAGS="${CFLAGS} -fdiagnostics-color=always"
+# Have gcc diagnostics be in color even if stderr is not going to a terminal.
+# It's nice having warnings in color even if I run a script that does
+#   'make 2>&1 | tee log.make'
+
 CFLAGS="${CFLAGS} -fstack-protector-strong -D_FORTIFY_SOURCE=2"
 LDFLAGS="${LDFLAGS} -fstack-protector-strong"
 # -fstack-protector-strong:  enable stack checking.
@@ -80,7 +86,6 @@ LDFLAGS="${LDFLAGS} -Wl,--nxcompat"
 #   $ peflags -v privoxy.exe
 #   privoxy.exe: coff(0x0106[+executable_image,+line_nums_stripped,+32bit_machine]) pe(0x0140[+dynamicbase,+nxcompat])
 
-
 LDFLAGS="${LDFLAGS} -Wl,--dynamicbase,--export-all-symbols"
 # https://en.wikipedia.org/wiki/Address_space_layout_randomization
 # https://stackoverflow.com/questions/24283918/how-can-i-enable-aslr-dep-and-safeseh-on-an-exe-in-codeblocks-using-mingw
@@ -127,9 +132,26 @@ CFLAGS="${CFLAGS} -Wshadow"
 
 # why does the mingw library _not_ include .a files for libpcre?
 # *sigh* build my own pcre so I can do static linking
-# Get the 8.x PCRE library from  https://ftp.pcre.org/pub/pcre/
-inc="/source/pcre-8.45/"
-lib="/source/pcre-8.45/.libs"
+# Get the 8.x PCRE library from
+#   https://sourceforge.net/projects/pcre/files/pcre/
+# Get the 10.x PCRE2 library from
+#   https://github.com/PCRE2Project/pcre2/releases
+#
+#
+usepcre2=yes
+#
+#
+if [ "$usepcre2" = "yes" ]; then
+    PCREOPT=""
+    inc="/source/pcre2-10.42/src/"
+      # need pcre2.h
+    lib="/source/pcre2-10.42/.libs"
+      # need libpcre2-8.a & libpcre2-posix.a
+else
+    PCREOPT="--disable-pcre2"
+    inc="/source/pcre-8.45/"
+    lib="/source/pcre-8.45/.libs"
+fi
 CPPFLAGS="${CPPFLAGS} -I${inc}"
 LDFLAGS="${LDFLAGS} -L${lib}"
 
@@ -140,8 +162,9 @@ LDFLAGS="${LDFLAGS} -L${lib}"
 ##   which is backward-compatible and will be supported for at least
 ##   3 years.
 # Get the 2.28.x mbedtls library from  https://github.com/Mbed-TLS/mbedtls/tags
-inc="/source/mbedtls-2.28.2/include"
-lib="/source/mbedtls-2.28.2/library"
+# Release Notes: https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.4
+inc="/source/mbedtls-2.28.4/include"
+lib="/source/mbedtls-2.28.4/library"
 
 MITMOPT="--with-mbedtls"
 CPPFLAGS="${CPPFLAGS} -I${inc}"
@@ -167,6 +190,7 @@ echo "LDFLAGS=${LDFLAGS}"
 
 ./configure  --host=i686-w64-mingw32  --enable-mingw32  --enable-zlib \
              --enable-extended-statistics \
+             ${PCREOPT} \
              --enable-pcre-host-patterns \
              --enable-static-linking \
              --enable-strptime-sanity-checks \