X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=configure;h=df59c1eaf088d2cb3c01031ac93d84f209d09f1f;hb=5c50b6cd2ec21ee3b58b4a6afa7c628bb9ed4c1b;hp=5a5e651d7da6c4b5de9e2347fd11ae09c7a4671b;hpb=cc7698e75316ef26c2e00492b500a3483a68f398;p=privoxy.git diff --git a/configure b/configure index 5a5e651d..df59c1ea 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.13 +# From configure.in Revision: 1.39 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -12,55 +12,58 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --with-docbook=[yes|no|directory] + Enable docbook documentation creation + (default = yes, for gnu and linux)" +ac_help="$ac_help + --with-debug Enable debug mode" ac_help="$ac_help --enable-mingw32 Use mingw32 for a Windows GUI" ac_help="$ac_help --disable-pthread Don't use POSIX threads (pthreads)" ac_help="$ac_help - --disable-toggle Don't support temporary disable" + --disable-toggle Don't support temporary disable" ac_help="$ac_help - --disable-gzip Block gzip'ed transfer of documents. Note that - this is required if you want content modification - even with gzip-supporting servers." -ac_help="$ac_help - --disable-force Don't allow blockfile to be bypassed" + --disable-force Don't allow single-page disable" ac_help="$ac_help --disable-fast-redirects Don't support fast redirects" ac_help="$ac_help - --disable-killpopup Never block popups" + --disable-killpopup Never block popups" ac_help="$ac_help - --disable-stats Don't keep statistics" + --disable-stats Don't keep statistics" ac_help="$ac_help - --disable-split-proxy-args One big show-proxy-args page, not one per file." + --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-webdav Don't support WebDAV. This option breaks MS - Outlook Express when accessing HotMail e-mail." + --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-ie-images Don't auto-detect whether a request from MS Internet - Explorer is for an image or HTML." + --disable-acl-files Prevents the use of ACL files to control access to + the proxy by IP address." ac_help="$ac_help - --disable-image-blocking Don't try to figure out whether a request is - for an image or HTML - assume HTML." + --disable-trust-files Prevents the use of trust files." ac_help="$ac_help - --disable-acl-files Prevents the use of ACL files to control access to - the proxy by IP address." + --disable-jar-files Prevents the use of jar files to capture cookies." ac_help="$ac_help - --disable-trust-files Prevents the use of trust files." + --disable-editor Prevents the use of the web-based actions file + editor and web-based temporary disable setting." ac_help="$ac_help - --disable-jar-files Prevents the use of jar files to capture cookies." + --enable-no-gifs Use politically correct PNG format instead of GIF + for built-in images. May not work with all browsers." ac_help="$ac_help - --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)" + --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" + --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" + --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 @@ -572,13 +575,76 @@ fi +ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + +# Make sure we can run config.sub. +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi + +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:605: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + + +dodk=auto +DKPREFIX=none +# Check whether --with-docbook or --without-docbook was given. +if test "${with_docbook+set}" = set; then + withval="$with_docbook" + case "$with_docbook" in +yes) dodk=yes;; +no) dodk=no;; +*) + dodk=no + DKPREFIX=$withval + ;; +esac + +fi VERSION_MAJOR=2 VERSION_MINOR=9 -VERSION_POINT=8 -CODE_STATUS="\"alpha\"" +VERSION_POINT=11 +CODE_STATUS="beta" + @@ -603,15 +669,14 @@ cat >> confdefs.h <> confdefs.h <&6 -echo "configure:615: checking for $ac_word" >&5 +echo "configure:680: 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 @@ -641,7 +706,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:645: checking for $ac_word" >&5 +echo "configure:710: 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 @@ -692,7 +757,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:696: checking for $ac_word" >&5 +echo "configure:761: 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 @@ -724,7 +789,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:793: 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. @@ -735,12 +800,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 739 "configure" +#line 804 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:809: \"$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 @@ -766,12 +831,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:770: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:835: 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:775: checking whether we are using GNU C" >&5 +echo "configure:840: 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 @@ -780,7 +845,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:784: \"$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:849: \"$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 @@ -799,7 +864,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:803: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:868: 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 @@ -831,7 +896,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:835: checking how to run the C preprocessor" >&5 +echo "configure:900: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -846,13 +911,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:856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:921: \"$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 : @@ -863,13 +928,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:873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:938: \"$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 : @@ -880,13 +945,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:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:955: \"$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 : @@ -911,22 +976,91 @@ fi echo "$ac_t""$CPP" 1>&6 +# Extract the first word of "gdb", so it can be a program name with args. +set dummy gdb; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:983: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GDB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$GDB"; then + ac_cv_prog_GDB="$GDB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_GDB="yes" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_GDB" && ac_cv_prog_GDB="no" +fi +fi +GDB="$ac_cv_prog_GDB" +if test -n "$GDB"; then + echo "$ac_t""$GDB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + +# Check whether --with-debug or --without-debug was given. +if test "${with_debug+set}" = set; then + withval="$with_debug" + + if test "x$withval" != "xno" ; then + if test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + if test "$GDB"; then + CFLAGS="-ggdb" + else + CFLAGS="-g" + fi + CFLAGS="$CFLAGS -Wshadow -Wconversion" + else + CFLAGS="-g" + fi + fi + fi + +else + + if test "X$CFLAGS" = "X"; then # if CFLAGS are unset + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi + fi + + +fi + + +if test "$GCC"; then + CFLAGS="-pipe $CFLAGS" +fi + echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:918: checking for mingw32 environment" >&5 +echo "configure:1052: 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:1064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -943,12 +1077,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:947: checking for Cygwin environment" >&5 +echo "configure:1081: 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:1097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -986,6 +1120,17 @@ else fi fi +if test $dodk = auto; then + dodk=no + if test $target_type = unix; then + case "$host_os" in + linux* | gnu*) + dodk=yes + ;; + esac + fi +fi + # Check whether --enable-mingw32 or --disable-mingw32 was given. if test "${enable_mingw32+set}" = set; then @@ -1014,6 +1159,183 @@ else fi +if test $dodk != no; then + for ac_prog in w3m lynx links +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1169: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_WDUMP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$WDUMP"; then + ac_cv_prog_WDUMP="$WDUMP" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_WDUMP="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +WDUMP="$ac_cv_prog_WDUMP" +if test -n "$WDUMP"; then + echo "$ac_t""$WDUMP" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$WDUMP" && break +done +test -n "$WDUMP" || WDUMP="false" + + if test "$WDUMP" = false; then + { echo "configure: error: You need some kind of text browser to continue \(w3m, lynx and links are supported\)" 1>&2; exit 1; } + fi +fi + + +for ac_prog in rpm +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1210: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RPMBIN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RPMBIN"; then + ac_cv_prog_RPMBIN="$RPMBIN" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RPMBIN="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +RPMBIN="$ac_cv_prog_RPMBIN" +if test -n "$RPMBIN"; then + echo "$ac_t""$RPMBIN" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$RPMBIN" && break +done +test -n "$RPMBIN" || RPMBIN="false" + +if test $RPMBIN != false; then + RPM_BASE=`rpm --eval "%{_topdir}"` + if test "$RPM_BASE" = ""; then + RPM_BASE=/usr/src/redhat + fi +fi + + +for ac_prog in jade openjade +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1253: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_JADEBIN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$JADEBIN"; then + ac_cv_prog_JADEBIN="$JADEBIN" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_JADEBIN="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +JADEBIN="$ac_cv_prog_JADEBIN" +if test -n "$JADEBIN"; then + echo "$ac_t""$JADEBIN" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$JADEBIN" && break +done +test -n "$JADEBIN" || JADEBIN="false" + + + +if test $dodk = yes; then + if test $DKPREFIX = none; then + +ac_safe=`echo "/usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for /usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl""... $ac_c" 1>&6 +echo "configure:1290: checking for /usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl" >&5 +if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; } +else + if test -r /usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl; then + eval "ac_cv_file_$ac_safe=yes" + else + eval "ac_cv_file_$ac_safe=no" + fi +fi +fi +if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + DKPREFIX=/usr/share/sgml/docbook/dsssl-stylesheets +else + echo "$ac_t""no" 1>&6 + +ac_safe=`echo "/usr/share/sgml/docbkdsl/html/docbook.dsl" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for /usr/share/sgml/docbkdsl/html/docbook.dsl""... $ac_c" 1>&6 +echo "configure:1312: checking for /usr/share/sgml/docbkdsl/html/docbook.dsl" >&5 +if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; } +else + if test -r /usr/share/sgml/docbkdsl/html/docbook.dsl; then + eval "ac_cv_file_$ac_safe=yes" + else + eval "ac_cv_file_$ac_safe=no" + fi +fi +fi +if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + DKPREFIX=/usr/share/sgml/docbkdsl +else + echo "$ac_t""no" 1>&6 + +fi + +fi + + fi +fi + + old_CFLAGS_nospecial=$CFLAGS CFLAGS="$CFLAGS $SPECIAL_CFLAGS" @@ -1026,17 +1348,17 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pthread.h""... $ac_c" 1>&6 -echo "configure:1030: checking for pthread.h" >&5 +echo "configure:1352: checking for pthread.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:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1362: \"$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* @@ -1059,39 +1381,607 @@ have_pthread=no fi -# Check whether --enable-pthread or --disable-pthread was given. -if test "${enable_pthread+set}" = set; then - enableval="$enable_pthread" - if test $enableval = no; then - # Disable pthreads - have_pthread=no -fi -fi +# Check whether --enable-pthread or --disable-pthread was given. +if test "${enable_pthread+set}" = set; then + enableval="$enable_pthread" + if test $enableval = no; then + # Disable pthreads + have_pthread=no +fi +fi + + +if test $have_pthread = yes; then + PTHREAD_ONLY= + cat >> confdefs.h <<\EOF +#define FEATURE_PTHREAD 1 +EOF + + echo Using POSIX threads + if test "$GCC" = "yes"; then + # Set a GCC specific switch: + if test "$target_type" = "unix"; then + # This compiler switch makes Linux thread-safe + # Don't know about other OS's? Is this switch + # supported? + PTHREAD_LIB= + SPECIAL_CFLAGS="-pthread" + fi + fi +else + PTHREAD_ONLY=# + echo Using native threads +fi + + + + +echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +echo "configure:1421: checking for gethostbyname in -lnsl" >&5 +ac_lib_var=`echo nsl'_'gethostbyname | 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="-lnsl $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_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + +echo $ac_n "checking for gethostbyaddr_r""... $ac_c" 1>&6 +echo "configure:1469: checking for gethostbyaddr_r" >&5 +if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr_r'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyaddr_r(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gethostbyaddr_r) || defined (__stub___gethostbyaddr_r) +choke me +#else +gethostbyaddr_r(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gethostbyaddr_r=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_gethostbyaddr_r=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'gethostbyaddr_r`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + echo $ac_n "checking signature of gethostbyaddr_r""... $ac_c" 1>&6 +echo "configure:1513: checking signature of gethostbyaddr_r" >&5 + cat > conftest.$ac_ext < + +int main() { + + struct hostent *h, *hp; + char *a, *b; + int l, bl, t, e; + (void) gethostbyaddr_r(a, l, t, h, b, bl, &hp, &e) + +; return 0; } +EOF +if { (eval echo configure:1529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +#define HAVE_GETHOSTBYADDR_R_8_ARGS 1 +EOF + + echo "$ac_t""8 args" 1>&6 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + cat > conftest.$ac_ext < + +int main() { + + struct hostent *h; + char *a, *b; + int l, bl, t, e; + (void) gethostbyaddr_r(a, l, t, h, b, bl, &e) + +; return 0; } +EOF +if { (eval echo configure:1558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +#define HAVE_GETHOSTBYADDR_R_7_ARGS 1 +EOF + + echo "$ac_t""7 args" 1>&6 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + cat > conftest.$ac_ext < + +int main() { + + struct hostent_data *d; + struct hostent *h; + char a, + int l, t; + (void) gethostbyaddr_r(a, l, t, h, d) + +; return 0; } +EOF +if { (eval echo configure:1588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +#define HAVE_GETHOSTBYADDR_R_5_ARGS 1 +EOF + + echo "$ac_t""5 args" 1>&6 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""unrecognised" 1>&6 + +fi +rm -f conftest* + +fi +rm -f conftest* + +fi +rm -f conftest* + +else + echo "$ac_t""no" 1>&6 + + echo "$ac_t""no" 1>&6 + +fi + + +echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6 +echo "configure:1622: checking for gethostbyname_r" >&5 +if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname_r(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gethostbyname_r) || defined (__stub___gethostbyname_r) +choke me +#else +gethostbyname_r(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gethostbyname_r=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_gethostbyname_r=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'gethostbyname_r`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + echo $ac_n "checking signature of gethostbyname_r""... $ac_c" 1>&6 +echo "configure:1666: checking signature of gethostbyname_r" >&5 + cat > conftest.$ac_ext < + +int main() { + + struct hostent *h, *r; + char *n, *b; + int bl, e; + (void) gethostbyname_r(n, h, b, bl, &r, &e) + +; return 0; } +EOF +if { (eval echo configure:1682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +#define HAVE_GETHOSTBYNAME_R_6_ARGS 1 +EOF + + echo "$ac_t""6 args" 1>&6 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + cat > conftest.$ac_ext < + +int main() { + + struct hostent *h; + char *n, *b; + int bl, e; + (void) gethostbyname_r(n, h, b, bl, &e) + +; return 0; } +EOF +if { (eval echo configure:1711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +#define HAVE_GETHOSTBYNAME_R_5_ARGS 1 +EOF + + echo "$ac_t""5 args" 1>&6 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + cat > conftest.$ac_ext < + +int main() { + + struct hostent_data *d; + struct hostent *h; + char *n, + (void) gethostbyname_r(n, h, d) + +; return 0; } +EOF +if { (eval echo configure:1740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +#define HAVE_GETHOSTBYNAME_R_3_ARGS 1 +EOF + + echo "$ac_t""3 args" 1>&6 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""unrecognised" 1>&6 + +fi +rm -f conftest* + +fi +rm -f conftest* + +fi +rm -f conftest* + +else + echo "$ac_t""no" 1>&6 + + echo "$ac_t""no" 1>&6 + +fi + + +echo $ac_n "checking for gmtime_r""... $ac_c" 1>&6 +echo "configure:1774: checking for gmtime_r" >&5 +if eval "test \"`echo '$''{'ac_cv_func_gmtime_r'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gmtime_r(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gmtime_r) || defined (__stub___gmtime_r) +choke me +#else +gmtime_r(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gmtime_r=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_gmtime_r=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'gmtime_r`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + echo $ac_n "checking signature of gmtime_r""... $ac_c" 1>&6 +echo "configure:1818: checking signature of gmtime_r" >&5 + cat > conftest.$ac_ext < + +int main() { + + struct time *t; + struct tm *tm; + (void) gmtime_r(t, tm) + +; return 0; } +EOF +if { (eval echo configure:1833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + echo "$ac_t""ok" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_GMTIME_R 1 +EOF + + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""unrecognised" 1>&6 + +fi +rm -f conftest* + +else + echo "$ac_t""no" 1>&6 + + echo "$ac_t""no" 1>&6 + +fi + + +echo $ac_n "checking for localtime_r""... $ac_c" 1>&6 +echo "configure:1861: checking for localtime_r" >&5 +if eval "test \"`echo '$''{'ac_cv_func_localtime_r'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char localtime_r(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_localtime_r) || defined (__stub___localtime_r) +choke me +#else +localtime_r(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_localtime_r=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_localtime_r=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'localtime_r`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + echo $ac_n "checking signature of localtime_r""... $ac_c" 1>&6 +echo "configure:1905: checking signature of localtime_r" >&5 + cat > conftest.$ac_ext < + +int main() { + + struct time *t; + struct tm *tm; + (void) localtime_r(t, tm) + +; return 0; } +EOF +if { (eval echo configure:1920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + echo "$ac_t""ok" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_LOCALTIME_R 1 +EOF + + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""unrecognised" 1>&6 + +fi +rm -f conftest* + +else + echo "$ac_t""no" 1>&6 + + echo "$ac_t""no" 1>&6 + +fi + + + + +SOCKET_LIB= + +case "$host" in +*-solaris*) SOCKET_LIB="-lsocket -lnsl" + cat >> confdefs.h <<\EOF +#define __EXTENSIONS__ 1 +EOF + + if test "$GCC" = "yes"; then + # Set a GCC specific switch: + # This compiler switch makes Solaris thread-safe + PTHREAD_LIB= + SPECIAL_CFLAGS="-pthreads" + else + # What do we do without GCC? Guess this: + SPECIAL_CFLAGS="-D_REENTRANT" + fi +;; +esac + + + + +case "$host" in +*-os2-emx*) SOCKET_LIB=-lsocket +;; +esac -if test $have_pthread = yes; then - PTHREAD_ONLY= - cat >> confdefs.h <<\EOF -#define FEATURE_PTHREAD 1 -EOF - echo Using POSIX threads - if test "$GCC" = "yes"; then - # Set a GCC specific switch: - if test "$target_type" = "unix"; then - # This compiler switch makes Linux thread-safe - # Don't know about other OS's? Is this switch - # supported? - PTHREAD_LIB= - SPECIAL_CFLAGS="-pthread" - fi - fi -else - PTHREAD_ONLY=# - echo Using native threads -fi +AMIGAOS_ONLY=# +case "$host" in +*-amigaos) AMIGAOS_ONLY= +;; +esac @@ -1099,7 +1989,7 @@ fi echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1103: checking for executable suffix" >&5 +echo "configure:1993: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1109,7 +1999,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1130,13 +2020,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:1134: checking for object suffix" >&5 +echo "configure:2024: 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:1140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1154,12 +2044,12 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1158: checking for ANSI C header files" >&5 +echo "configure:2048: 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 @@ -1167,7 +2057,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2061: \"$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* @@ -1184,7 +2074,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 @@ -1202,7 +2092,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 @@ -1223,7 +2113,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1234,7 +2124,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1258,12 +2148,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1262: checking for working const" >&5 +echo "configure:2152: 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:2206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1333,12 +2223,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1337: checking for size_t" >&5 +echo "configure:2227: 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 @@ -1365,17 +2255,212 @@ EOF fi +echo $ac_n "checking size of int""... $ac_c" 1>&6 +echo "configure:2260: checking size of int" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_int=4 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int)); + exit(0); +} +EOF +if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_int=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_int" 1>&6 +cat >> confdefs.h <&6 +echo "configure:2299: checking size of char *" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_char_p=4 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(char *)); + exit(0); +} +EOF +if { (eval echo configure:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_char_p=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_char_p=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6 +cat >> confdefs.h <&6 +echo "configure:2338: checking size of long" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_long=4 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long)); + exit(0); +} +EOF +if { (eval echo configure:2357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_long=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_long=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_long" 1>&6 +cat >> confdefs.h <&6 +echo "configure:2377: checking size of long long" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_long_long=8 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long long)); + exit(0); +} +EOF +if { (eval echo configure:2396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_long_long=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_long_long=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 +cat >> confdefs.h <&6 +echo "configure:2416: checking size of size_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_size_t=4 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(size_t)); + exit(0); +} +EOF +if { (eval echo configure:2435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_size_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_size_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_size_t" 1>&6 +cat >> confdefs.h <&6 -echo "configure:1374: checking for $ac_func" >&5 +echo "configure:2459: 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:2487: \"$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 @@ -1425,7 +2510,7 @@ done echo $ac_n "checking for pcre_compile in -lpcre""... $ac_c" 1>&6 -echo "configure:1429: checking for pcre_compile in -lpcre" >&5 +echo "configure:2514: 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 @@ -1433,7 +2518,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpcre $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1461,17 +2546,17 @@ 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:1465: checking for pcre.h" >&5 +echo "configure:2550: 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:1475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2560: \"$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* @@ -1499,7 +2584,7 @@ have_pcre=no fi echo $ac_n "checking for regcomp in -lpcreposix""... $ac_c" 1>&6 -echo "configure:1503: checking for regcomp in -lpcreposix" >&5 +echo "configure:2588: 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 @@ -1507,7 +2592,7 @@ 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 +if { (eval echo configure:2607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1535,17 +2620,17 @@ 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:1539: checking for pcreposix.h" >&5 +echo "configure:2624: 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:1549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2634: \"$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* @@ -1573,7 +2658,7 @@ have_pcreposix=no fi echo $ac_n "checking for pcrs_compile in -lpcrs""... $ac_c" 1>&6 -echo "configure:1577: checking for pcrs_compile in -lpcrs" >&5 +echo "configure:2662: 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 @@ -1581,7 +2666,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpcrs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1609,17 +2694,17 @@ 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:1613: checking for pcrs.h" >&5 +echo "configure:2698: 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:1623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2708: \"$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* @@ -1649,71 +2734,6 @@ fi -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1679: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - - -SOLARIS_ONLY=# - -case "$target" in -*-solaris*) cat >> confdefs.h <<\EOF -#define _REENTRANT 1 -EOF - - cat >> confdefs.h <<\EOF -#define __EXTENSIONS__ 1 -EOF - - SOLARIS_ONLY= -;; -esac - - - - cat >> confdefs.h <<\EOF #define __MT__ 1 EOF @@ -1725,28 +2745,16 @@ if test "${enable_toggle+set}" = set; then enableval="$enable_toggle" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define TOGGLE 1 +#define FEATURE_TOGGLE 1 EOF fi else cat >> confdefs.h <<\EOF -#define TOGGLE 1 -EOF - -fi - - -# 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 DENY_GZIP 1 +#define FEATURE_TOGGLE 1 EOF fi -fi # Check whether --enable-force or --disable-force was given. @@ -1754,13 +2762,13 @@ if test "${enable_force+set}" = set; then enableval="$enable_force" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define FORCE_LOAD 1 +#define FEATURE_FORCE_LOAD 1 EOF fi else cat >> confdefs.h <<\EOF -#define FORCE_LOAD 1 +#define FEATURE_FORCE_LOAD 1 EOF fi @@ -1771,13 +2779,13 @@ if test "${enable_fast_redirects+set}" = set; then enableval="$enable_fast_redirects" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define FAST_REDIRECTS 1 +#define FEATURE_FAST_REDIRECTS 1 EOF fi else cat >> confdefs.h <<\EOF -#define FAST_REDIRECTS 1 +#define FEATURE_FAST_REDIRECTS 1 EOF fi @@ -1788,13 +2796,13 @@ if test "${enable_killpopup+set}" = set; then enableval="$enable_killpopup" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define KILLPOPUPS 1 +#define FEATURE_KILL_POPUPS 1 EOF fi else cat >> confdefs.h <<\EOF -#define KILLPOPUPS 1 +#define FEATURE_KILL_POPUPS 1 EOF fi @@ -1805,138 +2813,134 @@ if test "${enable_stats+set}" = set; then enableval="$enable_stats" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define STATISTICS 1 +#define FEATURE_STATISTICS 1 EOF fi else cat >> confdefs.h <<\EOF -#define STATISTICS 1 +#define FEATURE_STATISTICS 1 EOF fi -# Check whether --enable-split-proxy-args or --disable-split-proxy-args was given. -if test "${enable_split_proxy_args+set}" = set; then - enableval="$enable_split_proxy_args" +# Check whether --enable-ie-images or --disable-ie-images was given. +if test "${enable_ie_images+set}" = set; then + enableval="$enable_ie_images" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define SPLIT_PROXY_ARGS 1 +#define FEATURE_IMAGE_DETECT_MSIE 1 EOF fi else cat >> confdefs.h <<\EOF -#define SPLIT_PROXY_ARGS 1 +#define FEATURE_IMAGE_DETECT_MSIE 1 EOF fi -# Check whether --enable-webdav or --disable-webdav was given. -if test "${enable_webdav+set}" = set; then - enableval="$enable_webdav" +# 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 WEBDAV 1 +#define FEATURE_IMAGE_BLOCKING 1 EOF fi else cat >> confdefs.h <<\EOF -#define WEBDAV 1 +#define FEATURE_IMAGE_BLOCKING 1 EOF fi -# Check whether --enable-ie-images or --disable-ie-images was given. -if test "${enable_ie_images+set}" = set; then - enableval="$enable_ie_images" +# Check whether --enable-acl-files or --disable-acl-files was given. +if test "${enable_acl_files+set}" = set; then + enableval="$enable_acl_files" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define DETECT_MSIE_IMAGES 1 +#define FEATURE_ACL 1 EOF fi else cat >> confdefs.h <<\EOF -#define DETECT_MSIE_IMAGES 1 +#define FEATURE_ACL 1 EOF fi -# Check whether --enable-image-blocking or --disable-image-blocking was given. -if test "${enable_image_blocking+set}" = set; then - enableval="$enable_image_blocking" +# Check whether --enable-trust-files or --disable-trust-files was given. +if test "${enable_trust_files+set}" = set; then + enableval="$enable_trust_files" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define IMAGE_BLOCKING 1 +#define FEATURE_TRUST 1 EOF fi else cat >> confdefs.h <<\EOF -#define IMAGE_BLOCKING 1 +#define FEATURE_TRUST 1 EOF fi -# Check whether --enable-acl-files or --disable-acl-files was given. -if test "${enable_acl_files+set}" = set; then - enableval="$enable_acl_files" +# Check whether --enable-jar-files or --disable-jar-files was given. +if test "${enable_jar_files+set}" = set; then + enableval="$enable_jar_files" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define ACL_FILES 1 +#define FEATURE_COOKIE_JAR 1 EOF fi else cat >> confdefs.h <<\EOF -#define ACL_FILES 1 +#define FEATURE_COOKIE_JAR 1 EOF fi -# Check whether --enable-trust-files or --disable-trust-files was given. -if test "${enable_trust_files+set}" = set; then - enableval="$enable_trust_files" +# Check whether --enable-editor or --disable-editor was given. +if test "${enable_editor+set}" = set; then + enableval="$enable_editor" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define TRUST_FILES 1 +#define FEATURE_CGI_EDIT_ACTIONS 1 EOF fi else cat >> confdefs.h <<\EOF -#define TRUST_FILES 1 +#define FEATURE_CGI_EDIT_ACTIONS 1 EOF fi -# Check whether --enable-jar-files or --disable-jar-files was given. -if test "${enable_jar_files+set}" = set; then - enableval="$enable_jar_files" +# Check whether --enable-no-gifs or --disable-no-gifs was given. +if test "${enable_no_gifs+set}" = set; then + enableval="$enable_no_gifs" if test $enableval = yes; then cat >> confdefs.h <<\EOF -#define JAR_FILES 1 +#define FEATURE_NO_GIFS 1 EOF fi -else - cat >> confdefs.h <<\EOF -#define JAR_FILES 1 -EOF - fi + # Check whether --enable-regex-matching or --disable-regex-matching was given. if test "${enable_regex_matching+set}" = set; then enableval="$enable_regex_matching" @@ -2043,6 +3047,8 @@ fi CFLAGS=$old_CFLAGS_nospecial + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -2143,7 +3149,7 @@ done ac_given_srcdir=$srcdir -trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "GNUmakefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -2410,4 +3424,3 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 -