X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=f732867fe35a6e2f28ecd8005a95337b6adff1ef;hp=6f772f06ea43b32ab83b65abb627d791065e82e1;hb=44e8cc1562d7079364b2b91ed1a962d68c72c7ca;hpb=f9b953ed3f2bc2de510352e56dfbf91efd19ac7e diff --git a/configure.in b/configure.in index 6f772f06..f732867f 100644 --- a/configure.in +++ b/configure.in @@ -76,16 +76,16 @@ dnl ================================================================= VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_POINT=29 +VERSION_POINT=30 CODE_STATUS="UNRELEASED" 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 -dnl set status to "UNRELEASED" whenever CVS differs from the last +dnl set status to "UNRELEASED" whenever git differs from the last dnl release and no new release is near. dnl ================================================================= @@ -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 @@ -1166,14 +1166,14 @@ if test X"$OPT_MBEDTLS" != Xno; then fi AC_SUBST(FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS) -dnl ======================================================== -dnl check for OpenSSL which is required for https inspection -dnl ======================================================== +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 detection for https inspection.]) -AC_HELP_STRING([--without-openssl], [Disable OpenSSL detection]), +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 @@ -1201,9 +1201,9 @@ if test X"$OPT_OPENSSL" != Xno; then 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="-Imbedtls/include $old_CFLAGS_nospecial" old_CFLAGS_nospecial="$old_CFLAGS_nospecial" FEATURE_HTTPS_INSPECTION_ONLY=