X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=2889ac2c07be25790a254d1dda23cfc39ff3b620;hp=df879e9f6a508e3549f5516e5c5077bfad10244a;hb=c5b8825873c2e08323d2521afab84a959bfa7248;hpb=86d5524f7e87b8b3bb76e4e054b0d8d069923875 diff --git a/configure.in b/configure.in index df879e9f..2889ac2c 100644 --- a/configure.in +++ b/configure.in @@ -1,9 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl $Id: configure.in,v 1.179 2013/03/01 17:40:18 fabiankeil Exp $ -dnl -dnl Written by and Copyright (C) 2001-2010 the -dnl Privoxy team. http://www.privoxy.org/ +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 by and Copyright (C) 1997 Anonymous Coders and @@ -32,7 +30,7 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.179 $) +AC_REVISION($Revision: 1.213 $) AC_INIT(jcc.c) if test ! -f config.h.in; then @@ -78,9 +76,13 @@ dnl ================================================================= VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_POINT=22 +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 dnl set status to "UNRELEASED" whenever CVS differs from the last @@ -94,6 +96,7 @@ AC_SUBST(VERSION_MAJOR) 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}) @@ -211,12 +214,14 @@ else AC_MSG_RESULT($with_group) $BGROUPS $USER >/dev/null if test $? -eq 0 ; then - # FIXME: this fails if valid group, but not first group - # listed. - if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then + for i in `$BGROUPS $USER | sed 's/.*: //' 2>/dev/null`; do + if test "x$i" = "x$with_group" ; then + GROUP=$with_group + break + fi + done + if test "x$GROUP" != "x$with_group" ; then AC_MSG_ERROR(The given value '$withval' does not match group entry) - else - GROUP=$with_group; fi else AC_MSG_ERROR(There is no group entry for user '$USER') @@ -280,7 +285,7 @@ if test $dodk = auto; then dodk=no if test $target_type = unix; then case "$host_os" in - linux* | gnu*) + linux* | gnu* | *bsd*) dodk=yes ;; esac @@ -300,8 +305,11 @@ fi]) 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=# @@ -341,10 +349,16 @@ if test $RPMBIN != false; then 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) @@ -381,6 +395,7 @@ dnl echo -n "checking for $i/html/docbook.dsl..." for i in /usr/share/sgml/CATALOG.docbk30 \ /usr/share/sgml/CATALOG.docbk31 \ /usr/share/sgml/CATALOG.docbk31 \ + /usr/local/share/sgml/docbook/2.4.1/docbook.cat \ /usr/local/share/sgml/docbook/3.0/docbook.cat \ /usr/local/share/sgml/docbook/3.1/docbook.cat \ /usr/share/sgml/docbook/dtd/3.1/docbook.cat \ @@ -406,6 +421,10 @@ AC_ARG_ENABLE(large-file-support, 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" @@ -462,6 +481,27 @@ fi AC_SUBST(PTHREAD_ONLY) +dnl ================================================================= +dnl On most platforms select() does not support fd numbers above +dnl FD_SETSIZE, as a result Privoxy can't handle more than +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. 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.]) + echo "Redefining FD_SETSIZE to $with_fdsetsize." + AC_MSG_WARN(On platforms that don't support FD_SETSIZE redefinition it may cause memory corruption.) + else + AC_MSG_ERROR(--with-fdsetsize used without value) + fi + ] +) + dnl ================================================================= dnl Support for thread-safe versions of gethostbyaddr, gethostbyname, dnl gmtime and localtime @@ -626,12 +666,16 @@ dnl ================================================================= 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 doesn't have it. ])) +fi dnl ================================================================= dnl OS/2 specific @@ -662,19 +706,6 @@ case "$host" in ;; esac -dnl ================================================================= -dnl AmigaOS specific -dnl ================================================================= - -AMIGAOS_ONLY=# - -case "$host" in -*-amigaos) AMIGAOS_ONLY= -;; -esac - -AC_SUBST(AMIGAOS_ONLY) - dnl ================================================================= dnl Haiku specific dnl ================================================================= @@ -713,6 +744,7 @@ AC_CHECK_SIZEOF(char *, 4) AC_CHECK_SIZEOF(long, 4) AC_CHECK_SIZEOF(long long, 8) AC_CHECK_SIZEOF(size_t, 4) +AC_CHECK_SIZEOF(time_t, 8) dnl Checks for header files. AC_CHECK_HEADERS([ \ @@ -742,7 +774,9 @@ AC_PROG_GCC_TRADITIONAL AC_TYPE_SIGNAL AC_CHECK_FUNCS([ \ access \ + arc4random \ atexit \ + calloc \ getcwd \ gethostbyaddr \ gethostbyaddr_r \ @@ -750,10 +784,10 @@ AC_CHECK_FUNCS([ \ gethostbyname_r \ gettimeofday \ inet_ntoa \ - localtime_r \ memchr \ memmove \ memset \ + nanosleep \ poll \ putenv \ random \ @@ -791,6 +825,7 @@ elif test $target_type = mingw; then AC_MSG_CHECKING(getaddrinfo in ws2_32) AC_TRY_LINK( [ + #include #include #include ], @@ -802,6 +837,7 @@ elif test $target_type = mingw; then AC_MSG_CHECKING(getnameinfo in ws2_32) AC_TRY_LINK( [ + #include #include #include ], @@ -898,13 +934,6 @@ AC_ARG_ENABLE(stats, 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.], @@ -914,7 +943,7 @@ fi], AC_DEFINE(FEATURE_IMAGE_BLOCKING)) AC_ARG_ENABLE(acl-support, -[ --disable-acl-support Prevents the use of ACLs to control access to +[ --disable-acl-support Prevents the use of ACLs to control access to Privoxy by IP address.], [if test $enableval = yes; then AC_DEFINE(FEATURE_ACL) @@ -961,6 +990,12 @@ AC_ARG_ENABLE(extended-host-patterns, AC_DEFINE(FEATURE_EXTENDED_HOST_PATTERNS) fi]) +AC_ARG_ENABLE(external-filters, +[ --enable-external-filters Allow to filter content with scripts and programs. Experimental.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_EXTERNAL_FILTERS,1,[Define to 1 to allow to filter content with scripts and programs.]) +fi]) + AC_ARG_ENABLE(accept-filter, [ --enable-accept-filter Try to use accf_http(9) if supported.], [if test $enableval = yes; then @@ -975,6 +1010,28 @@ AC_ARG_ENABLE(strptime-sanity-checks, AC_DEFINE(FEATURE_STRPTIME_SANITY_CHECKS) fi]) +AC_ARG_ENABLE(client-tags, +[ --disable-client-tags Disable support for client-specific tags], +[ if test $enableval = "no"; then have_client_tags=no; fi ]) +if test "${have_client_tags}" = "no"; then + echo "Disabling support for client-specific tags." + FEATURE_CLIENT_TAGS_ONLY="#" +else + echo "Enabling support for client-specific tags." + AC_DEFINE(FEATURE_CLIENT_TAGS,1,[Define to enable support for client-specific tags.]) + FEATURE_CLIENT_TAGS_ONLY="" +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: @@ -1033,13 +1090,16 @@ fi if test $have_pcre = "yes"; then echo "using libpcre" pcre_dyn=yes + AC_DEFINE(FEATURE_DYNAMIC_PCRE,1,[Define to dynamically link to pcre.]) STATIC_PCRE_ONLY=# 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]) pcre_dyn=no - AC_DEFINE(STATIC_PCRE) + # STATIC_PCRE is a name pcre needs to statically link on Windows. + # Privoxy itself no longer uses it. + AC_DEFINE(STATIC_PCRE,1,[Define to statically link to internal outdated pcre on Windows.]) STATIC_PCRE_ONLY= fi @@ -1071,6 +1131,36 @@ dnl fi 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 =================================================================