X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=1e21984f0a7176eba8553f2a64f9886a273cc3c4;hp=ee3539f6a0a2cc956766bc2317dbd237483f8932;hb=1f08d9d6f20b37b4e7fc055e4cfb20c0a01693f4;hpb=1984152e96950de76a71ac865d690a6a76a2fe46 diff --git a/configure.in b/configure.in index ee3539f6..1e21984f 100644 --- a/configure.in +++ b/configure.in @@ -77,11 +77,11 @@ dnl ================================================================= VERSION_MAJOR=3 VERSION_MINOR=0 VERSION_POINT=29 -CODE_STATUS="UNRELEASED" +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 +SOURCE_DATE_EPOCH=1605695571 dnl CODE_STATUS can be "alpha", "beta", "stable" or "UNRELEASED", dnl and will be used for CGI output. Increment version number and @@ -163,7 +163,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 @@ -934,6 +934,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.], @@ -979,7 +985,7 @@ AC_ARG_ENABLE(graceful-termination, fi]) AC_ARG_ENABLE(pcre-host-patterns, -[ --enable-pcre-host-patterns Allow to use PCRE syntax in host patterns by prefixing the pattern with +[ --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 @@ -1021,7 +1027,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.]) @@ -1127,10 +1133,11 @@ dnl fi AC_SUBST(STATIC_PCRE_ONLY) AC_SUBST(STATIC_PCRS_ONLY) +FEATURE_HTTPS_INSPECTION_ONLY=# dnl ======================================================== dnl check for mbedTLS which is required for https inspection dnl ======================================================== -FEATURE_HTTPS_INSPECTION_ONLY=# +FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS=# OPT_MBEDTLS=no AC_ARG_WITH(mbedtls,dnl AC_HELP_STRING([--with-mbedtls], [Enable mbedTLS detection for https inspection.]) @@ -1141,22 +1148,71 @@ if test X"$OPT_MBEDTLS" != Xno; then AC_CHECK_LIB(mbedtls, mbedtls_ssl_init, [ - AC_DEFINE(FEATURE_HTTPS_INSPECTION, 1, [if mbedTLS is enabled]) - AC_SUBST(FEATURE_HTTPS_INSPECTION, [1]) - FEATURE_HTTPS_INSPECTION="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_INSPECTION" = "xyes"; then + 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) +AC_SUBST(FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS) +dnl ================================================================= +dnl check for OpenSSL/LibreSSL which is required 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 "$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