projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebuild man page
[privoxy.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
7d3341d
..
4dd3d4b
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-73,21
+73,20
@@
DB2HTML=$withval
dnl =================================================================
dnl Application version number
dnl =================================================================
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_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=1605695571
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=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 release and no new release is near.
-
dnl =================================================================
dnl Substitute the version numbers
dnl =================================================================
dnl =================================================================
dnl Substitute the version numbers
dnl =================================================================
@@
-677,17
+676,6
@@
AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]),
fi
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 =================================================================
dnl =================================================================
dnl Mac OSX specific
dnl =================================================================
@@
-1097,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:
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
])
+ http
s://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.
pcre_dyn=no
# STATIC_PCRE is a name pcre needs to statically link on Windows.
# Privoxy itself no longer uses it.
@@
-1135,7
+1123,7
@@
AC_SUBST(STATIC_PCRS_ONLY)
FEATURE_HTTPS_INSPECTION_ONLY=#
dnl ========================================================
FEATURE_HTTPS_INSPECTION_ONLY=#
dnl ========================================================
-dnl check for mbedTLS which
is requir
ed for https inspection
+dnl check for mbedTLS which
can be us
ed for https inspection
dnl ========================================================
FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS=#
OPT_MBEDTLS=no
dnl ========================================================
FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS=#
OPT_MBEDTLS=no
@@
-1167,7
+1155,7
@@
fi
AC_SUBST(FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS)
dnl =================================================================
AC_SUBST(FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS)
dnl =================================================================
-dnl check for OpenSSL/LibreSSL which
is requir
ed for https inspection
+dnl check for OpenSSL/LibreSSL which
can be us
ed for https inspection
dnl =================================================================
FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL=#
OPT_OPENSSL=no
dnl =================================================================
FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL=#
OPT_OPENSSL=no
@@
-1177,6
+1165,10
@@
AC_HELP_STRING([--without-openssl], [Disable OpenSSL/LibreSSL detection]),
OPT_OPENSSL=$withval)
if test X"$OPT_OPENSSL" != Xno; then
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
+
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"
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"
@@
-1201,6
+1193,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.])
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"
LIBS="$LIBS -lssl -lcrypto"
old_CFLAGS_nospecial="$old_CFLAGS_nospecial"