X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=configure;h=f300ac4fb1b74b537054d7022fe3eaceeaabe02a;hb=4bb8225677e05ca9fe842f6343479fd4f875a022;hp=6c620ec364d4fa4e7189f543a5df5aa8826539ac;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7;p=privoxy.git diff --git a/configure b/configure index 6c620ec3..f300ac4f 100755 --- a/configure +++ b/configure @@ -13,16 +13,16 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --enable-mingw32 Use mingw32 for a Windows GUI" -ac_help="$ac_help - --disable-regex Don't allow regular expressions in the blockfile" -ac_help="$ac_help - --disable-pcre-regex Use old, slow GNU Regex instead of PCRE." ac_help="$ac_help --disable-toggle Don't support temporary disable" ac_help="$ac_help - --disable-pcrs Don't support arbitrary content modification" + --disable-pthread Don't use POSIX threads (pthreads)" +ac_help="$ac_help + --enable-gzip Allow gzip'ed transfer of documents. Note that this will make content modification impossible." ac_help="$ac_help --disable-force Don't allow blockfle to be bypassed" +ac_help="$ac_help + --disable-fast-redirects Don't support fast redirects" ac_help="$ac_help --disable-killpopup Never block popups" ac_help="$ac_help @@ -36,8 +36,8 @@ ac_help="$ac_help --disable-ie-images Don't auto-detect whether a request from MS Internet Explorer is for an image or HTML." ac_help="$ac_help - --disable-image-list Don't try to figure out whether a request is for an - image or HTML using the imagelist - assume HTML." + --disable-image-blocking Don't try to figure out whether a request is + for an image or HTML - assume HTML." ac_help="$ac_help --disable-acl-files Prevents the use of ACL files to control access to the proxy by IP address." @@ -46,8 +46,13 @@ ac_help="$ac_help ac_help="$ac_help --disable-jar-files Prevents the use of jar files to capture cookies." ac_help="$ac_help - --disable-static-pcre Link dynamically with the pcre and pcreposix - libraries. You must build the libraries seperately." + --enable-regex-matching=pcre Use perl-compatible regex for actionsfile pattern matching (default) + --enable-regex-matching=gnu Use gnu style regex for actionsfile pattern matching (-> bigger binary) + --disable-regex-matching Don't use regex matching, compare URL prefix instead (won't shrink birary)" +ac_help="$ac_help + --disable-dynamic-pcre Use the built-in, static pcre, even if libpcre is available" +ac_help="$ac_help + --disable-dynamic-pcrs Use the built-in, static pcrs, even if libpcrs is available" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -562,10 +567,15 @@ fi VERSION_MAJOR=2 VERSION_MINOR=9 -VERSION_POINT=3 +VERSION_POINT=6 + + +cat >> confdefs.h <<\EOF +#define CODE_STATUS "alpha" +EOF cat >> confdefs.h <&6 -echo "configure:592: checking for $ac_word" >&5 +echo "configure:602: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -618,7 +628,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:622: checking for $ac_word" >&5 +echo "configure:632: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -669,7 +679,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:673: checking for $ac_word" >&5 +echo "configure:683: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -701,7 +711,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:705: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:715: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -712,12 +722,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 716 "configure" +#line 726 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -743,12 +753,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:747: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:757: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:752: checking whether we are using GNU C" >&5 +echo "configure:762: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -757,7 +767,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -776,7 +786,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:780: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:790: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -808,7 +818,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:812: checking how to run the C preprocessor" >&5 +echo "configure:822: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -823,13 +833,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -840,13 +850,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -857,13 +867,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -889,19 +899,19 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:893: checking for mingw32 environment" >&5 +echo "configure:903: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -918,12 +928,12 @@ echo "$ac_t""$ac_cv_mingw32" 1>&6 MINGW32= test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:922: checking for Cygwin environment" >&5 +echo "configure:932: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -953,7 +963,7 @@ test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:957: checking for executable suffix" >&5 +echo "configure:967: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -963,7 +973,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -984,13 +994,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:988: checking for object suffix" >&5 +echo "configure:998: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1008,14 +1018,236 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext +echo $ac_n "checking for pcre_compile in -lpcre""... $ac_c" 1>&6 +echo "configure:1023: checking for pcre_compile in -lpcre" >&5 +ac_lib_var=`echo pcre'_'pcre_compile | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpcre $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "pcre.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for pcre.h""... $ac_c" 1>&6 +echo "configure:1059: checking for pcre.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + have_pcre=yes +else + echo "$ac_t""no" 1>&6 +have_pcre=no +fi + +else + echo "$ac_t""no" 1>&6 +have_pcre=no +fi + +echo $ac_n "checking for regcomp in -lpcreposix""... $ac_c" 1>&6 +echo "configure:1097: checking for regcomp in -lpcreposix" >&5 +ac_lib_var=`echo pcreposix'_'regcomp | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpcreposix -lpcre $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "pcreposix.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for pcreposix.h""... $ac_c" 1>&6 +echo "configure:1133: checking for pcreposix.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + have_pcreposix=yes +else + echo "$ac_t""no" 1>&6 +have_pcreposix=no +fi + +else + echo "$ac_t""no" 1>&6 +have_pcreposix=no +fi + +echo $ac_n "checking for pcrs_compile in -lpcrs""... $ac_c" 1>&6 +echo "configure:1171: checking for pcrs_compile in -lpcrs" >&5 +ac_lib_var=`echo pcrs'_'pcrs_compile | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpcrs $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "pcrs.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for pcrs.h""... $ac_c" 1>&6 +echo "configure:1207: checking for pcrs.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + have_pcrs=yes +else + echo "$ac_t""no" 1>&6 +have_pcrs=no +fi + +else + echo "$ac_t""no" 1>&6 +have_pcrs=no +fi + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1014: checking for ANSI C header files" >&5 +echo "configure:1246: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1023,7 +1255,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1040,7 +1272,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1058,7 +1290,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1079,7 +1311,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1090,7 +1322,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1115,12 +1347,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1119: checking for working const" >&5 +echo "configure:1351: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1190,12 +1422,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1194: checking for size_t" >&5 +echo "configure:1426: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1226,12 +1458,12 @@ fi for ac_func in strerror bcopy memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1230: checking for $ac_func" >&5 +echo "configure:1462: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1280,34 +1512,41 @@ done + # Check whether --enable-mingw32 or --disable-mingw32 was given. if test "${enable_mingw32+set}" = set; then enableval="$enable_mingw32" if test $enableval = yes; then WIN_ONLY= CYGWIN_FLAGS="-mwindows -mno-cygwin" + PTHREAD_LIB=-lpthreadGC echo "Using mingw32 (Win32 GUI)" else WIN_ONLY=# if test "$CYGWIN" = "yes"; then CYGWIN_FLAGS="-mno-win32" + PTHREAD_LIB= echo "Using Cygnus (Win32 command line)" else CYGWIN_FLAGS= + PTHREAD_LIB=-lpthread fi fi else if test "$MINGW32" = "yes"; then WIN_ONLY= CYGWIN_FLAGS="-mwindows -mno-cygwin" + PTHREAD_LIB=-lpthreadGC echo "Using mingw32 (Win32 GUI)" else WIN_ONLY=# if test "$CYGWIN" = "yes"; then CYGWIN_FLAGS="-mno-win32" + PTHREAD_LIB= echo "Using Cygnus (Win32 command line)" else CYGWIN_FLAGS= + PTHREAD_LIB=-lpthread fi fi fi @@ -1316,121 +1555,92 @@ fi -SOLARIS_ONLY=# - +SOLARIS_ONLY=# -GNU_REGEX_ONLY= -PCRE_REGEX_ONLY= -NO_REGEX_ONLY=# -# Check whether --enable-regex or --disable-regex was given. -if test "${enable_regex+set}" = set; then - enableval="$enable_regex" +# Check whether --enable-toggle or --disable-toggle was given. +if test "${enable_toggle+set}" = set; then + enableval="$enable_toggle" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define REGEX 1 +#define TOGGLE 1 EOF -else - NO_REGEX_ONLY= - GNU_REGEX_ONLY=# - PCRE_REGEX_ONLY=# fi else cat >> confdefs.h <<\EOF -#define REGEX 1 +#define TOGGLE 1 EOF fi -# Check whether --enable-pcre-regex or --disable-pcre-regex was given. -if test "${enable_pcre_regex+set}" = set; then - enableval="$enable_pcre_regex" +# Check whether --enable-pthread or --disable-pthread was given. +if test "${enable_pthread+set}" = set; then + enableval="$enable_pthread" if test $enableval = yes; then + PTHREAD_ONLY= cat >> confdefs.h <<\EOF -#define PCRE 1 +#define FEATURE_PTHREAD 1 EOF - GNU_REGEX_ONLY=# else - PCRE_REGEX_ONLY=# + PTHREAD_ONLY=# fi else cat >> confdefs.h <<\EOF -#define PCRE 1 +#define FEATURE_PTHREAD 1 EOF - GNU_REGEX_ONLY=# + PTHREAD_ONLY= fi - - - - - -# Check whether --enable-toggle or --disable-toggle was given. -if test "${enable_toggle+set}" = set; then - enableval="$enable_toggle" - if test $enableval = yes; then +# Check whether --enable-gzip or --disable-gzip was given. +if test "${enable_gzip+set}" = set; then + enableval="$enable_gzip" + if test $enableval = "no"; then cat >> confdefs.h <<\EOF -#define TOGGLE 1 +#define DENY_GZIP 1 EOF fi -else - cat >> confdefs.h <<\EOF -#define TOGGLE 1 -EOF - fi -PCRS_ONLY= -# Check whether --enable-pcrs or --disable-pcrs was given. -if test "${enable_pcrs+set}" = set; then - enableval="$enable_pcrs" +# Check whether --enable-force or --disable-force was given. +if test "${enable_force+set}" = set; then + enableval="$enable_force" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define PCRS 1 -EOF - - cat >> confdefs.h <<\EOF -#define DENY_GZIP 1 +#define FORCE_LOAD 1 EOF -else - PCRS_ONLY=# fi else cat >> confdefs.h <<\EOF -#define PCRS 1 -EOF - cat >> confdefs.h <<\EOF -#define DENY_GZIP 1 +#define FORCE_LOAD 1 EOF fi - -# Check whether --enable-force or --disable-force was given. -if test "${enable_force+set}" = set; then - enableval="$enable_force" +# Check whether --enable-fast-redirects or --disable-fast-redirects was given. +if test "${enable_fast_redirects+set}" = set; then + enableval="$enable_fast_redirects" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define FORCE_LOAD 1 +#define FAST_REDIRECTS 1 EOF fi else cat >> confdefs.h <<\EOF -#define FORCE_LOAD 1 +#define FAST_REDIRECTS 1 EOF fi @@ -1521,18 +1731,18 @@ EOF fi -# Check whether --enable-image-list or --disable-image-list was given. -if test "${enable_image_list+set}" = set; then - enableval="$enable_image_list" +# Check whether --enable-image-blocking or --disable-image-blocking was given. +if test "${enable_image_blocking+set}" = set; then + enableval="$enable_image_blocking" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define USE_IMAGE_LIST 1 +#define IMAGE_BLOCKING 1 EOF fi else cat >> confdefs.h <<\EOF -#define USE_IMAGE_LIST 1 +#define IMAGE_BLOCKING 1 EOF fi @@ -1589,20 +1799,109 @@ EOF fi -LIBRARY_PCRE_ONLY=# -STATIC_PCRE_ONLY= -# Check whether --enable-static-pcre or --disable-static-pcre was given. -if test "${enable_static_pcre+set}" = set; then - enableval="$enable_static_pcre" - if test $enableval = no; then - LIBRARY_PCRE_ONLY= + +# Check whether --enable-regex-matching or --disable-regex-matching was given. +if test "${enable_regex_matching+set}" = set; then + enableval="$enable_regex_matching" + regex_matching=$enableval +else + regex_matching=pcre +fi + + +# Check whether --enable-dynamic-pcre or --disable-dynamic-pcre was given. +if test "${enable_dynamic_pcre+set}" = set; then + enableval="$enable_dynamic_pcre" + if test $enableval = "no"; then have_pcre=no; fi +fi + + +# Check whether --enable-dynamic-pcrs or --disable-dynamic-pcrs was given. +if test "${enable_dynamic_pcrs+set}" = set; then + enableval="$enable_dynamic_pcrs" + if test $enableval = "no"; then have_pcrs=no; fi +fi + + + +# Is the regex URL matching based on libpcreposix, but we +# don't have that library? +# +if test $have_pcreposix = "yes" -o $regex_matching != "pcre"; then + dont_miss_pcreposix=yes +else + dont_miss_pcreposix=no +fi + +# If we have libpcre and either we also have pcreposix or +# we don't need pcreposix, then link pcre dynamically; else +# build it and link statically +# +if test $have_pcre = "yes" -a $dont_miss_pcreposix = "yes"; then + echo "using libpcre" + pcre_dyn=yes STATIC_PCRE_ONLY=# + LIBS="$LIBS -lpcre" +else + echo "using built-in static pcre" + pcre_dyn=no + cat >> confdefs.h <<\EOF +#define STATIC_PCRE 1 +EOF + + STATIC_PCRE_ONLY= fi + +# If we have libpcrs and pcre is linked dynamically +# then also link pcrs dynamically, else build and link +# pcrs statically +# +if test $have_pcrs = "yes" -a $pcre_dyn = "yes"; then + echo "using libpcrs" + STATIC_PCRS_ONLY=# + LIBS="$LIBS -lpcrs" +else + echo "using built-in static pcrs" + cat >> confdefs.h <<\EOF +#define STATIC_PCRS 1 +EOF + + STATIC_PCRS_ONLY= +fi + +# Which method should be used for URL matching? +# pcre, gnu regex or prefix matching? +# +if test $regex_matching = "gnu"; then + echo "using gnu regex for URL matching" + cat >> confdefs.h <<\EOF +#define REGEX_GNU 1 +EOF + + GNU_REGEX_ONLY= + PCRE_REGEX_ONLY=# +elif test $regex_matching = "pcre"; then + echo "using pcre regex for URL matching" + cat >> confdefs.h <<\EOF +#define REGEX_PCRE 1 +EOF + + GNU_REGEX_ONLY=# + PCRE_REGEX_ONLY= + if test $pcre_dyn = "yes"; then + LIBS="$LIBS -lpcreposix" + fi +else + echo -e "using prefix matching for URLs\nHint: This does NOT make the executable any smaller!" + GNU_REGEX_ONLY=# + PCRE_REGEX_ONLY=# fi + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1744,13 +2043,13 @@ s%@EXEEXT@%$EXEEXT%g s%@OBJEXT@%$OBJEXT%g s%@WIN_ONLY@%$WIN_ONLY%g s%@CYGWIN_FLAGS@%$CYGWIN_FLAGS%g +s%@PTHREAD_LIB@%$PTHREAD_LIB%g s%@SOLARIS_ONLY@%$SOLARIS_ONLY%g +s%@PTHREAD_ONLY@%$PTHREAD_ONLY%g s%@GNU_REGEX_ONLY@%$GNU_REGEX_ONLY%g s%@PCRE_REGEX_ONLY@%$PCRE_REGEX_ONLY%g -s%@NO_REGEX_ONLY@%$NO_REGEX_ONLY%g -s%@PCRS_ONLY@%$PCRS_ONLY%g -s%@LIBRARY_PCRE_ONLY@%$LIBRARY_PCRE_ONLY%g s%@STATIC_PCRE_ONLY@%$STATIC_PCRE_ONLY%g +s%@STATIC_PCRS_ONLY@%$STATIC_PCRS_ONLY%g CEOF EOF