X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=4dd3d4be9e3594849c76be6b0a3f4fcaa542ebf4;hp=873953591bf4e624755f23a838b42d1151fcb0de;hb=23445442f4bf0aa0bcf6e35df09daf8ef0d69d99;hpb=304265caf6f5074df69e69282e5f33bb8aedade5 diff --git a/configure.in b/configure.in index 87395359..4dd3d4be 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Written by and Copyright (C) 2001-2018 the +dnl Written by and Copyright (C) 2001-2020 the dnl Privoxy team. https://www.privoxy.org/ dnl dnl Based on the Internet Junkbuster originally written @@ -73,20 +73,19 @@ DB2HTML=$withval dnl ================================================================= dnl Application version number dnl ================================================================= +dnl CODE_STATUS can be "alpha", "beta", "stable" or "UNRELEASED", +dnl and will be used for CGI output. Increment version number and +dnl set status to "UNRELEASED" whenever git differs from the last +dnl release and no new release is near. VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_POINT=29 -CODE_STATUS="UNRELEASED" +VERSION_POINT=30 +CODE_STATUS="stable" dnl Timestamp (date +%s) used by the mtree-spec target. dnl Should be updated before releases but forgetting it isn't critical. -SOURCE_DATE_EPOCH=1545411710 - -dnl CODE_STATUS can be "alpha", "beta", "stable" or "UNRELEASED", -dnl and will be used for CGI output. Increment version number and -dnl set status to "UNRELEASED" whenever CVS differs from the last -dnl release and no new release is near. +SOURCE_DATE_EPOCH=1605695571 dnl ================================================================= dnl Substitute the version numbers @@ -163,7 +162,7 @@ dnl Check for user and group validity dnl ================================================================= -if test "$EMXOS2" = yes || test "$host_os" = haiku; then +if test "$host_os" = haiku; then echo "Skipping user and group validity stuff."; else @@ -677,17 +676,6 @@ AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]), fi -dnl ================================================================= -dnl OS/2 specific -dnl ================================================================= - -case "$host" in -*-os2-emx*) SOCKET_LIB=-lsocket -;; -esac - -AC_SUBST(SOCKET_LIB) - dnl ================================================================= dnl Mac OSX specific dnl ================================================================= @@ -934,6 +922,12 @@ AC_ARG_ENABLE(stats, AC_DEFINE(FEATURE_STATISTICS) fi],AC_DEFINE(FEATURE_STATISTICS)) +AC_ARG_ENABLE(extended-statistics, +[ --enable-extended-statistics Gather extended statistics.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_EXTENDED_STATISTICS) +fi]) + AC_ARG_ENABLE(image-blocking, [ --disable-image-blocking Don't try to figure out whether a request is for an image or HTML - assume HTML.], @@ -978,16 +972,12 @@ AC_ARG_ENABLE(graceful-termination, AC_DEFINE(FEATURE_GRACEFUL_TERMINATION) fi]) -AC_ARG_ENABLE(extended-host-patterns, -[ --enable-extended-host-patterns Enable and require PCRE syntax in host patterns. This feature hasn't - been announced yet and it's not clear if it's a good idea. It's expected - to work, but undocumented. You should only enable it if you know what - PCRE is and are sure that you need it for your host patterns. You can - use tools/url-pattern-translator.pl to convert existing action files to - use PCRE host patterns. Please don't enable this option when creating - packages for others that may not be expecting it.], +AC_ARG_ENABLE(pcre-host-patterns, +[ --enable-pcre-host-patterns Allow to use PCRE syntax in host patterns by prefixing the pattern with + "PCRE-HOST-PATTERN:". You can use tools/url-pattern-translator.pl to + convert existing action files to use PCRE host patterns.], [if test $enableval = yes; then - AC_DEFINE(FEATURE_EXTENDED_HOST_PATTERNS) + AC_DEFINE(FEATURE_PCRE_HOST_PATTERNS) fi]) AC_ARG_ENABLE(external-filters, @@ -1025,7 +1015,7 @@ AC_SUBST(FEATURE_CLIENT_TAGS_ONLY) FUZZ_ONLY="#" AC_ARG_ENABLE(fuzz, -[ --enable-fuzz Enable code that makes fuzzing more convenient], +[ --enable-fuzz Enable code that makes fuzzing more convenient], [if test $enableval = yes; then FUZZ_ONLY="" AC_DEFINE(FUZZ,1,[Define to make fuzzing more convenient.]) @@ -1095,7 +1085,7 @@ if test $have_pcre = "yes"; then LIBS="$LIBS -lpcre -lpcreposix" else AC_MSG_WARN([You are using the static PCRE code which is out of date and scheduled for removal, for details see: - http://sourceforge.net/mailarchive/forum.php?thread_name=20080511195555.2dc6cfdc%40fabiankeil.de&forum_name=ijbswa-developers]) + https://sourceforge.net/p/ijbswa/mailman/ijbswa-developers/thread/20080511195555.2dc6cfdc@fabiankeil.de/]) pcre_dyn=no # STATIC_PCRE is a name pcre needs to statically link on Windows. # Privoxy itself no longer uses it. @@ -1131,34 +1121,112 @@ dnl fi AC_SUBST(STATIC_PCRE_ONLY) AC_SUBST(STATIC_PCRS_ONLY) -dnl ======================================================= -dnl check for mbedTLS which is required for https filtering -dnl ======================================================= -FEATURE_HTTPS_FILTERING_ONLY=# +FEATURE_HTTPS_INSPECTION_ONLY=# +dnl ======================================================== +dnl check for mbedTLS which can be used for https inspection +dnl ======================================================== +FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS=# OPT_MBEDTLS=no AC_ARG_WITH(mbedtls,dnl -AC_HELP_STRING([--with-mbedtls],[enable mbedTLS detection for https filtering.]) -AC_HELP_STRING([--without-mbedtls], [disable mbedTLS detection]), +AC_HELP_STRING([--with-mbedtls], [Enable mbedTLS detection for https inspection.]) +AC_HELP_STRING([--without-mbedtls], [Disable mbedTLS detection]), OPT_MBEDTLS=$withval) if test X"$OPT_MBEDTLS" != Xno; then AC_CHECK_LIB(mbedtls, mbedtls_ssl_init, [ - AC_DEFINE(FEATURE_HTTPS_FILTERING, 1, [if mbedTLS is enabled]) - AC_SUBST(FEATURE_HTTPS_FILTERING, [1]) - FEATURE_HTTPS_FILTERING="yes" + AC_DEFINE(FEATURE_HTTPS_INSPECTION, 1, [if SSL/TLS is enabled]) + AC_DEFINE(FEATURE_HTTPS_INSPECTION_MBEDTLS, 1, [if mbedTLS is enabled]) + AC_SUBST(FEATURE_HTTPS_INSPECTION_MBEDTLS, [1]) + FEATURE_HTTPS_INSPECTION_MBEDTLS="yes" ], [], -lmbedx509 -lmbedcrypto) - if test "x$FEATURE_HTTPS_FILTERING" = "xyes"; then - AC_MSG_NOTICE([Detected mbedTLS. Enabling https filtering.]) + if test "x$FEATURE_HTTPS_INSPECTION_MBEDTLS" = "xyes"; then + AC_MSG_NOTICE([Detected mbedTLS. Enabling https inspection.]) LIBS="-lmbedtls -lmbedx509 -lmbedcrypto $LIBS" + old_CFLAGS_nospecial="-Imbedtls/include $old_CFLAGS_nospecial" + + FEATURE_HTTPS_INSPECTION_ONLY= + FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS= + fi +fi +AC_SUBST(FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS) + +dnl ================================================================= +dnl check for OpenSSL/LibreSSL which can be used for https inspection +dnl ================================================================= +FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL=# +OPT_OPENSSL=no +AC_ARG_WITH(openssl,dnl +AC_HELP_STRING([--with-openssl], [Enable OpenSSL/LibreSSL detection for https inspection.]) +AC_HELP_STRING([--without-openssl], [Disable OpenSSL/LibreSSL detection]), + OPT_OPENSSL=$withval) + +if test X"$OPT_OPENSSL" != Xno; then + if test X"$OPT_MBEDTLS" != Xno; then + AC_MSG_ERROR([OpenSSL and mbedTLS support can't be enabled at the same time]) + fi - FEATURE_HTTPS_FILTERING_ONLY= + if test "$PORTNAME" != "win32"; then + AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) + FOUND_SSL_LIB="no" + AC_CHECK_LIB(ssl, OPENSSL_init_ssl, [FOUND_SSL_LIB="yes"]) + AC_CHECK_LIB(ssl, SSL_library_init, [FOUND_SSL_LIB="yes"]) + AS_IF([test "x$FOUND_SSL_LIB" = xno], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) + else + AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) + FOUND_SSL_LIB="no" + AC_SEARCH_LIBS(OPENSSL_init_ssl, ssleay32 ssl, [FOUND_SSL_LIB="yes"]) + AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [FOUND_SSL_LIB="yes"]) + AS_IF([test "x$FOUND_SSL_LIB" = xno], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) + fi + + if test "x$FOUND_SSL_LIB" = xyes; then + AC_DEFINE(FEATURE_HTTPS_INSPECTION, 1, [if SSL/TLS is enabled]) + AC_DEFINE(FEATURE_HTTPS_INSPECTION_OPENSSL, 1, [if OpenSSL is enabled]) + AC_SUBST(FEATURE_HTTPS_INSPECTION_OPENSSL, [1]) + FEATURE_HTTPS_INSPECTION="yes" + FEATURE_HTTPS_INSPECTION_OPENSSL="yes" fi + + if test "x$FEATURE_HTTPS_INSPECTION_OPENSSL" = "xyes"; then + AC_MSG_NOTICE([Detected OpenSSL. Enabling https inspection.]) + AC_MSG_WARN([If you intend to redistribute Privoxy, please make sure the "special exception" from section 3 of the GPLv2 applies.]) + + LIBS="$LIBS -lssl -lcrypto" + old_CFLAGS_nospecial="$old_CFLAGS_nospecial" + + FEATURE_HTTPS_INSPECTION_ONLY= + FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL= + fi +fi +AC_SUBST(FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL) + +AC_SUBST(FEATURE_HTTPS_INSPECTION_ONLY) + +dnl ======================================================== +dnl Check for Brotli which can be used for decompression +dnl ======================================================== +WITH_BROTLI=no +AC_ARG_WITH(brotli, +AC_HELP_STRING([--with-brotli], [Enable Brotli detection]) +AC_HELP_STRING([--without-brotli], [Disable Brotli detection]), + WITH_BROTLI=$withval) + +if test X"$WITH_BROTLI" != Xno; then + + LIBS="$LIBS -lbrotlidec" + + AC_CHECK_LIB(brotlidec, BrotliDecoderDecompress) + + AC_CHECK_HEADERS(brotli/decode.h, + FEATURE_BROTLI=1 + AC_DEFINE(FEATURE_BROTLI, 1, [If Brotli is used for decompression]) + AC_SUBST(FEATURE_BROTLI, [1]) + ) fi -AC_SUBST(FEATURE_HTTPS_FILTERING_ONLY) dnl =================================================================