dnl Process this file with autoconf to produce a configure script.
dnl
-dnl $Id: configure.in,v 1.202 2016/07/26 10:47:13 fabiankeil Exp $
-dnl
-dnl Written by and Copyright (C) 2001-2016 the
+dnl Written by and Copyright (C) 2001-2019 the
dnl Privoxy team. https://www.privoxy.org/
dnl
dnl Based on the Internet Junkbuster originally written
dnl AutoConf Initialization
dnl =================================================================
-AC_REVISION($Revision: 1.202 $)
+AC_REVISION($Revision: 1.213 $)
AC_INIT(jcc.c)
if test ! -f config.h.in; then
VERSION_MAJOR=3
VERSION_MINOR=0
-VERSION_POINT=26
-CODE_STATUS="stable"
+VERSION_POINT=29
+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
AC_SUBST(VERSION_MINOR)
AC_SUBST(VERSION_POINT)
AC_SUBST(CODE_STATUS)
+AC_SUBST(SOURCE_DATE_EPOCH)
dnl
AC_DEFINE_UNQUOTED(VERSION_MAJOR,${VERSION_MAJOR})
if test $target_type = mingw; then
WIN_ONLY=
CFLAGS="$CFLAGS -DWINVER=0x501"
- SPECIAL_CFLAGS="-mwindows -mno-cygwin"
- PTHREAD_LIB=-lpthreadGC
+ SPECIAL_CFLAGS="-mwindows"
+dnl from the cygwin FAQ: The regular setup allows you to use the -mwindows option
+dnl to include a set of the basic libraries user32, gdi32 and comdlg32.
+dnl (and also make your program a GUI program instead of a console program)
+ PTHREAD_LIB=-lpthread
echo "Using mingw32 (Win32 GUI)"
else
WIN_ONLY=#
fi
AC_SUBST(RPM_BASE)
+dnl prefer openjade to jade
dnl Check for jade, so we can build the documentation
-AC_CHECK_PROGS(JADEBIN,jade openjade,false)
+AC_CHECK_PROGS(JADEBIN,openjade jade,false)
AC_SUBST(JADEBIN)
+dnl Prefer OpenSP to SP
+dnl ref: https://lists.privoxy.org/pipermail/privoxy-devel/2018-November/000293.html
+AC_CHECK_PROGS(NSGMLS,onsgmls nsgmls,false)
+AC_SUBST(NSGMLS)
+
dnl Check for man2html for docs.
AC_CHECK_PROGS(MAN2HTML,man2html,false)
AC_SUBST(MAN2HTML)
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1"
fi])
+AC_ARG_ENABLE(static-linking,
+[ --enable-static-linking Use static linking instead of dynamic linking (ie. LDFLAGS=-static)],
+[ if test $enableval = yes; then LDFLAGS="$LDFLAGS -static"; fi ])
+
dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS
old_CFLAGS_nospecial=$CFLAGS
CFLAGS="$CFLAGS $SPECIAL_CFLAGS"
dnl approximately FD_SETSIZE/2 client connections.
dnl On some platforms the value can be changed at compile time,
dnl on others it's hardcoded and requires recompilation of the OS.
+dnl Only relevant if select() is actually being used.
dnl =================================================================
AC_ARG_WITH(fdsetsize,
- [ --with-fdsetsize=n Optimistically redefine FD_SETSIZE with the intend to change the number of connections Privoxy can handle. Dangerous if the platform doesn't support this.],
+ [ --with-fdsetsize=n Optimistically redefine FD_SETSIZE with the intend to change the number of connections Privoxy can handle. Dangerous if the platform doesn't support this. Pointless if Privoxy can use poll() instead of select().],
[
if test "x$withval" != "xyes"; then
AC_DEFINE_UNQUOTED(FD_SETSIZE,$with_fdsetsize,[Relevant for select(). Not honoured by all OS.])
dnl Solaris problem, and others perhaps (socklen_t is undefined)
dnl =================================================================
+if test $target_type != mingw; then
+# i686-w64-mingw32-gcc gets socklen_t define from ws2tcpip.h
+
AC_MSG_CHECKING([for socklen_t])
AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]),
AC_MSG_RESULT([no])
AC_DEFINE(socklen_t,int,
[ Define to 'int' if <sys/socket.h> doesn't have it. ]))
+fi
dnl =================================================================
dnl OS/2 specific
;;
esac
-dnl =================================================================
-dnl AmigaOS specific
-dnl =================================================================
-
-AMIGAOS_ONLY=#
-
-case "$host" in
-*-amigaos) AMIGAOS_ONLY=
-;;
-esac
-
-AC_SUBST(AMIGAOS_ONLY)
-
dnl =================================================================
dnl Haiku specific
dnl =================================================================
AC_TYPE_SIGNAL
AC_CHECK_FUNCS([ \
access \
+ arc4random \
atexit \
+ calloc \
getcwd \
gethostbyaddr \
gethostbyaddr_r \
memchr \
memmove \
memset \
+ nanosleep \
poll \
putenv \
random \
AC_MSG_CHECKING(getaddrinfo in ws2_32)
AC_TRY_LINK(
[
+ #include<winsock2.h>
#include<windows.h>
#include<ws2tcpip.h>
],
AC_MSG_CHECKING(getnameinfo in ws2_32)
AC_TRY_LINK(
[
+ #include<winsock2.h>
#include<windows.h>
#include<ws2tcpip.h>
],
AC_DEFINE(FEATURE_STATISTICS)
fi],AC_DEFINE(FEATURE_STATISTICS))
-AC_ARG_ENABLE(ie-images,
-[ --enable-ie-images Enable a quick but not always reliable auto-detect whether requests from
- MS Internet Explorer are for an image or not.],
-[if test $enableval = yes; then
- AC_DEFINE(FEATURE_IMAGE_DETECT_MSIE)
-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.],
fi
AC_SUBST(FEATURE_CLIENT_TAGS_ONLY)
+FUZZ_ONLY="#"
+AC_ARG_ENABLE(fuzz,
+[ --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.])
+fi])
+AC_SUBST(FUZZ_ONLY)
+
dnl pcre/pcrs is needed for CGI anyway, so
dnl the choice is only between static and
dnl dynamic:
AC_SUBST(STATIC_PCRE_ONLY)
AC_SUBST(STATIC_PCRS_ONLY)
+dnl ========================================================
+dnl check for mbedTLS which is required for https inspection
+dnl ========================================================
+FEATURE_HTTPS_INSPECTION_ONLY=#
+OPT_MBEDTLS=no
+AC_ARG_WITH(mbedtls,dnl
+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_INSPECTION, 1, [if mbedTLS is enabled])
+ AC_SUBST(FEATURE_HTTPS_INSPECTION, [1])
+ FEATURE_HTTPS_INSPECTION="yes"
+ ], [], -lmbedx509 -lmbedcrypto)
+
+ if test "x$FEATURE_HTTPS_INSPECTION" = "xyes"; then
+ AC_MSG_NOTICE([Detected mbedTLS. Enabling https inspection.])
+
+ LIBS="-lmbedtls -lmbedx509 -lmbedcrypto $LIBS"
+
+ FEATURE_HTTPS_INSPECTION_ONLY=
+ fi
+fi
+AC_SUBST(FEATURE_HTTPS_INSPECTION_ONLY)
+
+
dnl =================================================================
dnl Final cleanup and output
dnl =================================================================
projects / privoxy.git / blobdiff