X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=91d8128da6b6477cae354161f446d671e89cf0a1;hp=c1e8dbac14573772675fcf343067414f1e89a569;hb=bf3617413ce8781d84af3b67bfcb4f59b59a40e7;hpb=cff17ae123c66edd9967f0a9b56296198c3c1412 diff --git a/configure.in b/configure.in index c1e8dbac..91d8128d 100644 --- a/configure.in +++ b/configure.in @@ -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 +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 - -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 @@ -1097,7 +1096,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. @@ -1166,14 +1165,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,6 +1200,7 @@ 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="$old_CFLAGS_nospecial"