Index: Makefile =================================================================== --- Makefile (revision 506980) +++ Makefile (working copy) @@ -28,10 +28,11 @@ # installed port preference over it. ## -OPTIONS_DEFINE= DKIM SPF CURL LDAP P0F POSTFIX DOCS EXAMPLES -OPTIONS_DEFAULT= DKIM SPF CURL +OPTIONS_DEFINE= DKIM SPF MAXMINDDB CURL LDAP P0F POSTFIX DOCS EXAMPLES +OPTIONS_DEFAULT= DKIM SPF MAXMINDDB DKIM_DESC= DKIM support SPF_DESC= SPF support +MAXMINDDB_DESC= Enable GeoIP1 + GeoIP2 Support CURL_DESC= curl support P0F_DESC= P0F support POSTFIX_DESC= Use Postfix instead of Sendmail @@ -39,6 +40,7 @@ DKIM_LIB_DEPENDS= libopendkim.so:mail/opendkim P0F_RUN_DEPENDS= p0f:net-mgmt/p0f SPF_LIB_DEPENDS= libspf2.so:mail/libspf2 +MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb CURL_LIB_DEPENDS= libcurl.so:ftp/curl POSTFIX_CONFIGURE_ENABLE= postfix @@ -50,6 +52,7 @@ DKIM_CONFIGURE_ON= --with-libopendkim=${LOCALBASE} DKIM_USES= ssl SPF_CONFIGURE_ON= --with-libspf2=${LOCALBASE} +MAXMINDDB_CONFIGURE_ON= --with-libmaxminddb=${LOCALBASE} CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} LDAP_LDFLAGS= -L${LOCALBASE}/lib Index: files/patch-libmaxminddb-support_from_GH-geoip2-fork =================================================================== --- files/patch-libmaxminddb-support_from_GH-geoip2-fork (nonexistent) +++ files/patch-libmaxminddb-support_from_GH-geoip2-fork (working copy) @@ -0,0 +1,3316 @@ +--- README ++++ README +@@ -60,7 +60,7 @@ Build dependencies: + Optional dependencies: + - libspf2, libspf_alt or libspf, for SPF support + - libcurl, for URL checks support +-- libGeoIP, for GeoIP support ++- libmaxminddb, for GeoIP2 support + - libbind from BIND 9, for DNSRBL support, except if your system has a + thread-safe DNS resolver built-in. + +--- conf_yacc.y ++++ conf_yacc.y +@@ -57,7 +57,7 @@ __RCSID("$Id: conf_yacc.y,v 1.129 2016/11/24 04:11:37 manu Exp $"); + #endif + #include "prop.h" + #ifdef USE_GEOIP +-#include "geoip.h" ++#include "maxminddb.h" + #endif + #ifdef USE_P0F + #include "p0f.h" +@@ -149,7 +149,6 @@ lines : lines netblock '\n' + | lines socket '\n' + | lines user '\n' + | lines geoipdb '\n' +- | lines geoipv6db '\n' + | lines nodetach '\n' + | lines lazyaw '\n' + | lines report '\n' +@@ -772,19 +771,6 @@ geoipdb: GEOIPDB QSTRING { + #endif + } + ; +-geoipv6db: GEOIPV6DB QSTRING { +-#ifdef USE_GEOIP +- char path[QSTRLEN + 1]; +- +- geoip_set_db_v6(quotepath(path, $2, QSTRLEN)); +-#else +- mg_log(LOG_INFO, +- "GeoIP support not compiled in, " +- "ignore line %d", +- conf_line); +-#endif +- } +- ; + report: REPORT NONE { conf.c_report = C_GLNONE; } + | REPORT DELAYS { conf.c_report = C_DELAYS; } + | REPORT NODELAYS { conf.c_report = C_NODELAYS; } +--- configure.ac ++++ configure.ac +@@ -455,10 +455,10 @@ LDFLAGS=$SAVEDLDFLAGS + CFLAGS=$SAVEDCFLAGS + LIBS=$SAVEDLIBS + +-AC_ARG_WITH(libGeoIP, +- [ --with-libGeoIP=DIR Find libGeoIP in DIR], ++AC_ARG_WITH(libmaxminddb, ++ [ --with-libmaxminddb=DIR Find GeoIP2 libmaxminddb in DIR], + [CFLAGS=$CFLAGS" -I$withval/include -DUSE_GEOIP" +- LIBS="-lGeoIP $LIBS" ++ LIBS="-lmaxminddb $LIBS" + LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib"]) + AC_ARG_WITH(libdmalloc, + [ --with-libdmalloc=DIR Find libdmalloc in DIR], +--- configure ++++ configure +@@ -1,13 +1,11 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.65 for milter-greylist 4.6.2. ++# Generated by GNU Autoconf 2.69 for milter-greylist 4.6.2. + # + # Report bugs to . + # + # +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. + # + # + # This configure script is free software; the Free Software Foundation +@@ -91,6 +89,7 @@ fi + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. ++as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -135,6 +134,31 @@ export LANGUAGE + # CDPATH. + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + ++# Use a proper internal environment variable to ensure we don't fall ++ # into an infinite loop, continuously re-executing ourselves. ++ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then ++ _as_can_reexec=no; export _as_can_reexec; ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++as_fn_exit 255 ++ fi ++ # We don't want this to propagate to other subprocesses. ++ { _as_can_reexec=; unset _as_can_reexec;} + if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh +@@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + else + exitcode=1; echo positional parameters were not saved. + fi +-test x\$exitcode = x0 || exit 1" ++test x\$exitcode = x0 || exit 1 ++test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && +@@ -213,14 +238,25 @@ IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : +- # We cannot yet assume a decent shell, so we have to provide a +- # neutralization value for shells without unset; and this also +- # works around shells that cannot unset nonexistent variables. +- BASH_ENV=/dev/null +- ENV=/dev/null +- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++ export CONFIG_SHELL ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++exit 255 + fi + + if test x$as_have_required = xno; then : +@@ -319,10 +355,18 @@ $as_echo X"$as_dir" | + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p ++ ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p + # as_fn_append VAR VALUE + # ---------------------- + # Append the text in VALUE to the end of the definition contained in VAR. Take +@@ -359,19 +403,19 @@ else + fi # as_fn_arith + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -444,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + ++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have ++ # already done that, so ensure we don't try to do so again and fall ++ # in an infinite loop. This has already happened in practice. ++ _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). +@@ -478,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -499,28 +547,8 @@ else + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in #( +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -533,7 +561,7 @@ test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +@@ -682,7 +710,7 @@ with_openldap + with_openldap_static + with_libcurl + with_libcurl_static +-with_libGeoIP ++with_libmaxminddb + with_libdmalloc + with_libspf2 + with_libspf2_static +@@ -785,8 +813,9 @@ do + fi + + case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -831,7 +860,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -857,7 +886,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1061,7 +1090,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1077,7 +1106,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1107,8 +1136,8 @@ do + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) as_fn_error "unrecognized option: \`$ac_option' +-Try \`$0 --help' for more information." ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" + ;; + + *=*) +@@ -1116,7 +1145,7 @@ Try \`$0 --help' for more information." + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) +- as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; +@@ -1126,7 +1155,7 @@ Try \`$0 --help' for more information." + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +@@ -1134,13 +1163,13 @@ done + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- as_fn_error "missing argument to $ac_option" ++ as_fn_error $? "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1163,7 +1192,7 @@ do + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1177,8 +1206,6 @@ target=$target_alias + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1193,9 +1220,9 @@ test "$silent" = yes && exec 6>/dev/null + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- as_fn_error "working directory cannot be determined" ++ as_fn_error $? "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- as_fn_error "pwd does not report name of working directory" ++ as_fn_error $? "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1234,11 +1261,11 @@ else + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1278,7 +1305,7 @@ Configuration: + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages ++ -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files +@@ -1364,7 +1391,7 @@ Optional Packages: + --with-openldap-static(=DIR) Find OpenLDAP in DIR and link statically + --with-libcurl=DIR Find libcurl in DIR + --with-libcurl-static=DIR Find libcurl in DIR and link statically +- --with-libGeoIP=DIR Find libGeoIP in DIR ++ --with-libmaxminddb=DIR Find GeoIP2 libmaxminddb in DIR + --with-libdmalloc=DIR Find libdmalloc in DIR + --with-libspf2=DIR Find libspf2 in DIR + --with-libspf2-static=DIR Find libspf2 in DIR and link statically +@@ -1391,8 +1418,9 @@ Some influential environment variables: + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory +- YACC The `Yet Another C Compiler' implementation to use. Defaults to +- the first program found out of: `bison -y', `byacc', `yacc'. ++ YACC The `Yet Another Compiler Compiler' implementation to use. ++ Defaults to the first program found out of: `bison -y', `byacc', ++ `yacc'. + YFLAGS The list of arguments that will be passed by default to $YACC. + This script will default YFLAGS to the empty string to avoid a + default value of `-d' given by some make applications. +@@ -1465,9 +1493,9 @@ test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF + milter-greylist configure 4.6.2 +-generated by GNU Autoconf 2.65 ++generated by GNU Autoconf 2.69 + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2012 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1511,7 +1539,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile +@@ -1543,7 +1571,7 @@ $as_echo "$ac_try_echo"; } >&5 + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext ++ test -x conftest$ac_exeext + }; then : + ac_retval=0 + else +@@ -1557,7 +1585,7 @@ fi + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_link +@@ -1583,7 +1611,7 @@ $as_echo "$ac_try_echo"; } >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : +@@ -1594,7 +1622,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp +@@ -1636,7 +1664,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=$ac_status + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_run +@@ -1649,10 +1677,10 @@ fi + ac_fn_c_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -1688,7 +1716,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : + else + ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 + $as_echo "$ac_header_preproc" >&6; } + +@@ -1711,17 +1739,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 + $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +-( cat <<\_ASBOX +-## ------------------------------ ## ++( $as_echo "## ------------------------------ ## + ## Report this to manu@netbsd.org ## +-## ------------------------------ ## +-_ASBOX ++## ------------------------------ ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -1730,7 +1756,7 @@ eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_header_mongrel + +@@ -1743,7 +1769,7 @@ ac_fn_c_check_header_compile () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -1761,7 +1787,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_header_compile + +@@ -1774,7 +1800,7 @@ ac_fn_c_check_type () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=no" +@@ -1815,7 +1841,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_type + +@@ -1827,7 +1853,7 @@ ac_fn_c_check_func () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -1882,7 +1908,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_func + +@@ -1895,7 +1921,7 @@ ac_fn_c_check_member () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 + $as_echo_n "checking for $2.$3... " >&6; } +-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$4+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -1939,7 +1965,7 @@ fi + eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_member + cat >config.log <<_ACEOF +@@ -1947,7 +1973,7 @@ This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by milter-greylist $as_me 4.6.2, which was +-generated by GNU Autoconf 2.65. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +@@ -2057,11 +2083,9 @@ trap 'exit_status=$? + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -2095,11 +2119,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + ) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do +@@ -2112,11 +2134,9 @@ _ASBOX + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## ++ $as_echo "## ------------------- ## + ## File substitutions. ## +-## ------------------- ## +-_ASBOX ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do +@@ -2130,11 +2150,9 @@ _ASBOX + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo + cat confdefs.h + echo +@@ -2189,7 +2207,12 @@ _ACEOF + ac_site_file1=NONE + ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in #(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac + elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +@@ -2204,7 +2227,11 @@ do + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5; } + fi + done + +@@ -2280,7 +2307,7 @@ if $ac_cache_corrupted; then + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 + $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi + ## -------------------- ## + ## Main body of script. ## +@@ -2308,7 +2335,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}gcc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2320,7 +2347,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2348,7 +2375,7 @@ if test -z "$ac_cv_prog_CC"; then + set dummy gcc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -2360,7 +2387,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2401,7 +2428,7 @@ if test -z "$CC"; then + set dummy ${ac_tool_prefix}cc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2413,7 +2440,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2441,7 +2468,7 @@ if test -z "$CC"; then + set dummy cc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2454,7 +2481,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -2500,7 +2527,7 @@ if test -z "$CC"; then + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2512,7 +2539,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2544,7 +2571,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -2556,7 +2583,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2598,8 +2625,8 @@ fi + + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "no acceptable C compiler found in \$PATH +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5; } + + # Provide some information about the compiler. + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -2713,9 +2740,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "C compiler cannot create executables +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +@@ -2757,8 +2783,8 @@ done + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5; } + fi + rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +@@ -2815,9 +2841,9 @@ $as_echo "$ac_try_echo"; } >&5 + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. ++as_fn_error $? "cannot run C compiled programs. + If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5; } + fi + fi + fi +@@ -2828,7 +2854,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out + ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then : ++if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2868,8 +2894,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5; } + fi + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +@@ -2879,7 +2905,7 @@ OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2916,7 +2942,7 @@ ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then : ++if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag +@@ -2994,7 +3020,7 @@ else + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then : ++if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no +@@ -3003,8 +3029,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +-#include +-#include ++struct stat; + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ + struct buf { int x; }; + FILE * (*rcsopen) (struct buf *, struct stat *, int); +@@ -3096,7 +3121,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_LEX+set}" = set; then : ++if ${ac_cv_prog_LEX+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$LEX"; then +@@ -3108,7 +3133,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LEX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3140,7 +3165,8 @@ a { ECHO; } + b { REJECT; } + c { yymore (); } + d { yyless (1); } +-e { yyless (input () != 0); } ++e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ ++ yyless ((input () != 0)); } + f { unput (yytext[0]); } + . { BEGIN INITIAL; } + %% +@@ -3166,7 +3192,7 @@ $as_echo "$ac_try_echo"; } >&5 + test $ac_status = 0; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 + $as_echo_n "checking lex output file root... " >&6; } +-if test "${ac_cv_prog_lex_root+set}" = set; then : ++if ${ac_cv_prog_lex_root+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -3175,7 +3201,7 @@ if test -f lex.yy.c; then + elif test -f lexyy.c; then + ac_cv_prog_lex_root=lexyy + else +- as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5 ++ as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 +@@ -3185,7 +3211,7 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root + if test -z "${LEXLIB+set}"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 + $as_echo_n "checking lex library... " >&6; } +-if test "${ac_cv_lib_lex+set}" = set; then : ++if ${ac_cv_lib_lex+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -3215,7 +3241,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 + $as_echo_n "checking whether yytext is a pointer... " >&6; } +-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then : ++if ${ac_cv_prog_lex_yytext_pointer+:} false; then : + $as_echo_n "(cached) " >&6 + else + # POSIX says lex can declare yytext either as a pointer or an array; the +@@ -3226,7 +3252,8 @@ ac_save_LIBS=$LIBS + LIBS="$LEXLIB $ac_save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#define YYTEXT_POINTER 1 ++ ++ #define YYTEXT_POINTER 1 + `cat $LEX_OUTPUT_ROOT.c` + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +@@ -3253,7 +3280,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_YACC+set}" = set; then : ++if ${ac_cv_prog_YACC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$YACC"; then +@@ -3265,7 +3292,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_YACC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3292,16 +3319,22 @@ test -n "$YACC" || YACC="yacc" + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- for ac_t in install-sh install.sh shtool; do +- if test -f "$ac_dir/$ac_t"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/$ac_t -c" +- break 2 +- fi +- done ++ 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 ++ elif test -f "$ac_dir/shtool"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break ++ fi + done + if test -z "$ac_aux_dir"; then +- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -3330,7 +3363,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 + $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then : ++if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -3350,7 +3383,7 @@ case $as_dir/ in #(( + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -3412,7 +3445,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_MKDEP+set}" = set; then : ++if ${ac_cv_prog_MKDEP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$MKDEP"; then +@@ -3424,7 +3457,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MKDEP="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3454,7 +3487,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_RM+set}" = set; then : ++if ${ac_cv_prog_RM+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RM"; then +@@ -3466,7 +3499,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RM="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3496,7 +3529,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_MV+set}" = set; then : ++if ${ac_cv_prog_MV+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$MV"; then +@@ -3508,7 +3541,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MV="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3538,7 +3571,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_TEST+set}" = set; then : ++if ${ac_cv_prog_TEST+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$TEST"; then +@@ -3550,7 +3583,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_TEST="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3580,7 +3613,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_SED+set}" = set; then : ++if ${ac_cv_prog_SED+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$SED"; then +@@ -3592,7 +3625,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_SED="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3622,7 +3655,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_TRUE+set}" = set; then : ++if ${ac_cv_prog_TRUE+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$TRUE"; then +@@ -3634,7 +3667,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_TRUE="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3664,7 +3697,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_TOUCH+set}" = set; then : ++if ${ac_cv_prog_TOUCH+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$TOUCH"; then +@@ -3676,7 +3709,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_TOUCH="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4003,7 +4036,7 @@ if test "${with_libbind+set}" = set; then : + LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind9_getaddresses in -lbind" >&5 + $as_echo_n "checking for bind9_getaddresses in -lbind... " >&6; } +-if test "${ac_cv_lib_bind_bind9_getaddresses+set}" = set; then : ++if ${ac_cv_lib_bind_bind9_getaddresses+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4037,7 +4070,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_bind9_getaddresses" >&5 + $as_echo "$ac_cv_lib_bind_bind9_getaddresses" >&6; } +-if test "x$ac_cv_lib_bind_bind9_getaddresses" = x""yes; then : ++if test "x$ac_cv_lib_bind_bind9_getaddresses" = xyes; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -4047,7 +4080,7 @@ if test "x$ac_cv_lib_bind_bind9_getaddresses" = x""yes; then : + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind9_getaddresses in -lbind9" >&5 + $as_echo_n "checking for bind9_getaddresses in -lbind9... " >&6; } +-if test "${ac_cv_lib_bind9_bind9_getaddresses+set}" = set; then : ++if ${ac_cv_lib_bind9_bind9_getaddresses+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4081,7 +4114,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind9_bind9_getaddresses" >&5 + $as_echo "$ac_cv_lib_bind9_bind9_getaddresses" >&6; } +-if test "x$ac_cv_lib_bind9_bind9_getaddresses" = x""yes; then : ++if test "x$ac_cv_lib_bind9_bind9_getaddresses" = xyes; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -4135,9 +4168,10 @@ if test "${with_openssl+set}" = set; then : + LIBS_openssl_ssl="-lssl" + LIBS_openssl_crypto="-lcrypto" + SAVEDLIBS="$LIBS_openssl_ssl $LIBS_openssl_crypto $LIBS" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lc -lssh2" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_c -lssh2''_main" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lc -lssh2" >&5 + $as_echo_n "checking for main in -lc -lssh2... " >&6; } +-if test "${ac_cv_lib_c__lssh2_main+set}" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4155,17 +4189,18 @@ return main (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_c__lssh2_main=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_c__lssh2_main=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c__lssh2_main" >&5 +-$as_echo "$ac_cv_lib_c__lssh2_main" >&6; } +-if test "x$ac_cv_lib_c__lssh2_main" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + LIBS_openssl_ssh2="-lssh2 -lz" + echo "autodetected libssh2: $LIBS_openssl_ssh2" +@@ -4217,7 +4252,7 @@ if test "${with_openssl_static+set}" = set; then : + as_ac_Lib=`$as_echo "ac_cv_lib_c $_lib_ssh2''_main" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lc $_lib_ssh2" >&5 + $as_echo_n "checking for main in -lc $_lib_ssh2... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4246,8 +4281,7 @@ fi + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + LIBS_openssl_ssh2="$_lib_ssh2 -lz" + echo "autodetected libssh2: $LIBS_openssl_ssh2" +@@ -4300,7 +4334,7 @@ if test "${with_openldap+set}" = set; then : + as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5 + $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4335,8 +4369,7 @@ fi + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLIBS="$_ldap_LIBS $LIBS" + LIBS_openldap="$_ldap_LIBS" +@@ -4346,7 +4379,7 @@ else + as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5 + $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4381,8 +4414,7 @@ fi + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLIBS="$_ldap_LIBS $LIBS" + LIBS_openldap="$_ldap_LIBS" +@@ -4448,7 +4480,7 @@ if test "${with_openldap_static+set}" = set; then : + as_ac_Lib=`$as_echo "ac_cv_lib_c -l$L''_main" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lc -l$L" >&5 + $as_echo_n "checking for main in -lc -l$L... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4477,8 +4509,7 @@ fi + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LIBS_openldap_add="-l$L $LIBS_openldap_add" + fi + +@@ -4488,7 +4519,7 @@ fi + as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5 + $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4523,8 +4554,7 @@ fi + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLIBS="$_ldap_LIBS $LIBS" + +@@ -4533,7 +4563,7 @@ else + as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5 + $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4568,8 +4598,7 @@ fi + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLIBS="$_ldap_LIBS $LIBS" + +@@ -4578,7 +4607,7 @@ else + as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5 + $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4613,8 +4642,7 @@ fi + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLIBS="$_ldap_LIBS $LIBS" + +@@ -4623,7 +4651,7 @@ else + as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5 + $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4658,8 +4686,7 @@ fi + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLIBS="$_ldap_LIBS $LIBS" + +@@ -4668,7 +4695,7 @@ else + as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5 + $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4703,8 +4730,7 @@ fi + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLIBS="$_ldap_LIBS $LIBS" + +@@ -4759,7 +4785,7 @@ if test "${with_libcurl_static+set}" = set; then : + _lib_idn="" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lidn" >&5 + $as_echo_n "checking for main in -lidn... " >&6; } +-if test "${ac_cv_lib_idn_main+set}" = set; then : ++if ${ac_cv_lib_idn_main+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4787,7 +4813,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_idn_main" >&5 + $as_echo "$ac_cv_lib_idn_main" >&6; } +-if test "x$ac_cv_lib_idn_main" = x""yes; then : ++if test "x$ac_cv_lib_idn_main" = xyes; then : + echo "autodetected libidn, will use with libcurl" + _lib_idn="-lidn" + SAVEDLIBS=" $_lib_idn $LIBS" +@@ -4797,7 +4823,7 @@ fi + as_ac_Lib=`$as_echo "ac_cv_lib_curl $_lib_idn''_Curl_connect" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Curl_connect in -lcurl $_lib_idn" >&5 + $as_echo_n "checking for Curl_connect in -lcurl $_lib_idn... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4832,8 +4858,7 @@ fi + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -4844,7 +4869,7 @@ else + as_ac_Lib=`$as_echo "ac_cv_lib_curl $_lib_idn $LIBS_openssl_ssh2''_Curl_connect" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Curl_connect in -lcurl $_lib_idn $LIBS_openssl_ssh2" >&5 + $as_echo_n "checking for Curl_connect in -lcurl $_lib_idn $LIBS_openssl_ssh2... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -4879,8 +4904,7 @@ fi + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -4905,10 +4929,10 @@ CFLAGS=$SAVEDCFLAGS + LIBS=$SAVEDLIBS + + +-# Check whether --with-libGeoIP was given. +-if test "${with_libGeoIP+set}" = set; then : +- withval=$with_libGeoIP; CFLAGS=$CFLAGS" -I$withval/include -DUSE_GEOIP" +- LIBS="-lGeoIP $LIBS" ++# Check whether --with-libmaxminddb was given. ++if test "${with_libmaxminddb+set}" = set; then : ++ withval=$with_libmaxminddb; CFLAGS=$CFLAGS" -I$withval/include -DUSE_GEOIP" ++ LIBS="-lmaxminddb $LIBS" + LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib" + fi + +@@ -4934,7 +4958,7 @@ if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then : ++ if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -4964,7 +4988,7 @@ else + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -4980,11 +5004,11 @@ else + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -5023,7 +5047,7 @@ else + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -5039,18 +5063,18 @@ else + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5; } + fi + + ac_ext=c +@@ -5062,7 +5086,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then : ++if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -5076,7 +5100,7 @@ do + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++ as_fn_executable_p "$ac_path_GREP" || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in +@@ -5111,7 +5135,7 @@ esac + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP +@@ -5125,7 +5149,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then : ++if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -5142,7 +5166,7 @@ do + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++ as_fn_executable_p "$ac_path_EGREP" || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in +@@ -5177,7 +5201,7 @@ esac + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -5192,7 +5216,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then : ++if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -5309,8 +5333,7 @@ do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -5324,8 +5347,7 @@ for ac_header in arpa/inet.h fcntl.h netinet/in.h stdlib.h string.h strings.h sy + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -5337,7 +5359,7 @@ done + + # Checks for typedefs, structures, and compiler characteristics. + ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" +-if test "x$ac_cv_type_pid_t" = x""yes; then : ++if test "x$ac_cv_type_pid_t" = xyes; then : + + else + +@@ -5348,7 +5370,7 @@ _ACEOF + fi + + ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +-if test "x$ac_cv_type_size_t" = x""yes; then : ++if test "x$ac_cv_type_size_t" = xyes; then : + + else + +@@ -5360,7 +5382,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 + $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +-if test "${ac_cv_header_time+set}" = set; then : ++if ${ac_cv_header_time+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -5402,7 +5424,7 @@ ac_fn_c_check_type "$LINENO" "res_state" "ac_cv_type_res_state" " + #include + + " +-if test "x$ac_cv_type_res_state" = x""yes; then : ++if test "x$ac_cv_type_res_state" = xyes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_RES_STATE 1 +@@ -5472,8 +5494,8 @@ $as_echo_n "checking if -lcurl needs -lcrypto to link and run... " >&6; } + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5; } + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -5494,8 +5516,8 @@ else + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5; } + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -5540,7 +5562,7 @@ fi + for ac_header in vfork.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" +-if test "x$ac_cv_header_vfork_h" = x""yes; then : ++if test "x$ac_cv_header_vfork_h" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_VFORK_H 1 + _ACEOF +@@ -5553,8 +5575,7 @@ for ac_func in fork vfork + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -5565,7 +5586,7 @@ done + if test "x$ac_cv_func_fork" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 + $as_echo_n "checking for working fork... " >&6; } +-if test "${ac_cv_func_fork_works+set}" = set; then : ++if ${ac_cv_func_fork_works+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -5618,7 +5639,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork + if test "x$ac_cv_func_vfork" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 + $as_echo_n "checking for working vfork... " >&6; } +-if test "${ac_cv_func_vfork_works+set}" = set; then : ++if ${ac_cv_func_vfork_works+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -5754,7 +5775,7 @@ fi + for ac_func in strftime + do : + ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" +-if test "x$ac_cv_func_strftime" = x""yes; then : ++if test "x$ac_cv_func_strftime" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_STRFTIME 1 + _ACEOF +@@ -5763,7 +5784,7 @@ else + # strftime is in -lintl on SCO UNIX. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 + $as_echo_n "checking for strftime in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_strftime+set}" = set; then : ++if ${ac_cv_lib_intl_strftime+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -5797,7 +5818,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 + $as_echo "$ac_cv_lib_intl_strftime" >&6; } +-if test "x$ac_cv_lib_intl_strftime" = x""yes; then : ++if test "x$ac_cv_lib_intl_strftime" = xyes; then : + $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h + + LIBS="-lintl $LIBS" +@@ -5808,7 +5829,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 + $as_echo_n "checking for working memcmp... " >&6; } +-if test "${ac_cv_func_memcmp_working+set}" = set; then : ++if ${ac_cv_func_memcmp_working+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -5872,8 +5893,7 @@ for ac_header in sys/select.h sys/socket.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -5884,7 +5904,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5 + $as_echo_n "checking types of arguments for select... " >&6; } +-if test "${ac_cv_func_select_args+set}" = set; then : ++if ${ac_cv_func_select_args+:} false; then : + $as_echo_n "(cached) " >&6 + else + for ac_arg234 in 'fd_set *' 'int *' 'void *'; do +@@ -5918,7 +5938,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done + done + # Provide a safe default value. +-: ${ac_cv_func_select_args='int,int *,struct timeval *'} ++: "${ac_cv_func_select_args=int,int *,struct timeval *}" + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 +@@ -5944,7 +5964,7 @@ _ACEOF + + rm -f conftest* + +-if test "${ac_cv_func_setvbuf_reversed+set}" = set; then : ++if ${ac_cv_func_setvbuf_reversed+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_func_setvbuf_reversed=no +@@ -5953,7 +5973,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 + $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } +-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : ++if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then : + $as_echo_n "(cached) " >&6 + else + rm -f conftest.sym conftest.file +@@ -6015,7 +6035,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 + $as_echo_n "checking whether stat accepts an empty string... " >&6; } +-if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then : ++if ${ac_cv_func_stat_empty_string_bug+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -6063,8 +6083,7 @@ for ac_func in bzero gettimeofday malloc inet_ntoa strerror select socket initgr + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -6079,7 +6098,7 @@ done + # FIXME: FreeBSD 4.x wants -pthread + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 + $as_echo_n "checking for pthread_create in -lpthread... " >&6; } +-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : ++if ${ac_cv_lib_pthread_pthread_create+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6113,12 +6132,12 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 + $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } +-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : ++if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : + LIBS="$LIBS -lpthread" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5 + $as_echo_n "checking for pthread_create in -lc_r... " >&6; } +-if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then : ++if ${ac_cv_lib_c_r_pthread_create+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6152,12 +6171,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_create" >&5 + $as_echo "$ac_cv_lib_c_r_pthread_create" >&6; } +-if test "x$ac_cv_lib_c_r_pthread_create" = x""yes; then : ++if test "x$ac_cv_lib_c_r_pthread_create" = xyes; then : + LIBS="$LIBS -lc_r" + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads -lpthread" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_pthreads -lpthread''_pthread_create" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads -lpthread" >&5 + $as_echo_n "checking for pthread_create in -lpthreads -lpthread... " >&6; } +-if test "${ac_cv_lib_pthreads__lpthread_pthread_create+set}" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6181,17 +6201,18 @@ return pthread_create (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_pthreads__lpthread_pthread_create=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_pthreads__lpthread_pthread_create=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads__lpthread_pthread_create" >&5 +-$as_echo "$ac_cv_lib_pthreads__lpthread_pthread_create" >&6; } +-if test "x$ac_cv_lib_pthreads__lpthread_pthread_create" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LIBS="$LIBS -lpthreads -lpthread" + else + echo "Required libpthread not found. Use --with-libpthread"; +@@ -6215,7 +6236,7 @@ if test "${with_libspf2+set}" = set; then : + CFLAGS=$CFLAGS" -I$withval/include" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2" >&5 + $as_echo_n "checking for SPF_server_new in -lspf2... " >&6; } +-if test "${ac_cv_lib_spf2_SPF_server_new+set}" = set; then : ++if ${ac_cv_lib_spf2_SPF_server_new+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6249,7 +6270,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2_SPF_server_new" >&5 + $as_echo "$ac_cv_lib_spf2_SPF_server_new" >&6; } +-if test "x$ac_cv_lib_spf2_SPF_server_new" = x""yes; then : ++if test "x$ac_cv_lib_spf2_SPF_server_new" = xyes; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -6259,9 +6280,10 @@ $as_echo "#define HAVE_SPF2 /**/" >>confdefs.h + + + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2 -lintl" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_spf2 -lintl''_SPF_server_new" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2 -lintl" >&5 + $as_echo_n "checking for SPF_server_new in -lspf2 -lintl... " >&6; } +-if test "${ac_cv_lib_spf2__lintl_SPF_server_new+set}" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6285,17 +6307,18 @@ return SPF_server_new (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_spf2__lintl_SPF_server_new=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_spf2__lintl_SPF_server_new=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2__lintl_SPF_server_new" >&5 +-$as_echo "$ac_cv_lib_spf2__lintl_SPF_server_new" >&6; } +-if test "x$ac_cv_lib_spf2__lintl_SPF_server_new" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -6329,7 +6352,7 @@ if test "${with_libspf2_static+set}" = set; then : + CFLAGS=$CFLAGS" -I$withval/include" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2" >&5 + $as_echo_n "checking for SPF_server_new in -lspf2... " >&6; } +-if test "${ac_cv_lib_spf2_SPF_server_new+set}" = set; then : ++if ${ac_cv_lib_spf2_SPF_server_new+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6363,7 +6386,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2_SPF_server_new" >&5 + $as_echo "$ac_cv_lib_spf2_SPF_server_new" >&6; } +-if test "x$ac_cv_lib_spf2_SPF_server_new" = x""yes; then : ++if test "x$ac_cv_lib_spf2_SPF_server_new" = xyes; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -6373,9 +6396,10 @@ $as_echo "#define HAVE_SPF2 /**/" >>confdefs.h + + + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2 -lintl" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_spf2 -lintl''_SPF_server_new" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2 -lintl" >&5 + $as_echo_n "checking for SPF_server_new in -lspf2 -lintl... " >&6; } +-if test "${ac_cv_lib_spf2__lintl_SPF_server_new+set}" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6399,17 +6423,18 @@ return SPF_server_new (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_spf2__lintl_SPF_server_new=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_spf2__lintl_SPF_server_new=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2__lintl_SPF_server_new" >&5 +-$as_echo "$ac_cv_lib_spf2__lintl_SPF_server_new" >&6; } +-if test "x$ac_cv_lib_spf2__lintl_SPF_server_new" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -6444,7 +6469,7 @@ if test "${with_libspf2_10+set}" = set; then : + CFLAGS=$CFLAGS" -I$withval/include" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf2" >&5 + $as_echo_n "checking for SPF_create_config in -lspf2... " >&6; } +-if test "${ac_cv_lib_spf2_SPF_create_config+set}" = set; then : ++if ${ac_cv_lib_spf2_SPF_create_config+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6478,7 +6503,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2_SPF_create_config" >&5 + $as_echo "$ac_cv_lib_spf2_SPF_create_config" >&6; } +-if test "x$ac_cv_lib_spf2_SPF_create_config" = x""yes; then : ++if test "x$ac_cv_lib_spf2_SPF_create_config" = xyes; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -6488,9 +6513,10 @@ $as_echo "#define HAVE_SPF2_10 /**/" >>confdefs.h + + + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf2 -lintl" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_spf2 -lintl''_SPF_create_config" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf2 -lintl" >&5 + $as_echo_n "checking for SPF_create_config in -lspf2 -lintl... " >&6; } +-if test "${ac_cv_lib_spf2__lintl_SPF_create_config+set}" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6514,17 +6540,18 @@ return SPF_create_config (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_spf2__lintl_SPF_create_config=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_spf2__lintl_SPF_create_config=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2__lintl_SPF_create_config" >&5 +-$as_echo "$ac_cv_lib_spf2__lintl_SPF_create_config" >&6; } +-if test "x$ac_cv_lib_spf2__lintl_SPF_create_config" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -6558,7 +6585,7 @@ if test "${with_libspf_alt+set}" = set; then : + CFLAGS=$CFLAGS" -I$withval/include" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf_alt" >&5 + $as_echo_n "checking for SPF_create_config in -lspf_alt... " >&6; } +-if test "${ac_cv_lib_spf_alt_SPF_create_config+set}" = set; then : ++if ${ac_cv_lib_spf_alt_SPF_create_config+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6592,7 +6619,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf_alt_SPF_create_config" >&5 + $as_echo "$ac_cv_lib_spf_alt_SPF_create_config" >&6; } +-if test "x$ac_cv_lib_spf_alt_SPF_create_config" = x""yes; then : ++if test "x$ac_cv_lib_spf_alt_SPF_create_config" = xyes; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -6602,9 +6629,10 @@ $as_echo "#define HAVE_SPF_ALT /**/" >>confdefs.h + + + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf_alt -lintl" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_spf_alt -lintl''_SPF_create_config" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf_alt -lintl" >&5 + $as_echo_n "checking for SPF_create_config in -lspf_alt -lintl... " >&6; } +-if test "${ac_cv_lib_spf_alt__lintl_SPF_create_config+set}" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6628,17 +6656,18 @@ return SPF_create_config (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_spf_alt__lintl_SPF_create_config=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_spf_alt__lintl_SPF_create_config=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf_alt__lintl_SPF_create_config" >&5 +-$as_echo "$ac_cv_lib_spf_alt__lintl_SPF_create_config" >&6; } +-if test "x$ac_cv_lib_spf_alt__lintl_SPF_create_config" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -6672,7 +6701,7 @@ if test "${with_libspf+set}" = set; then : + CFLAGS=$CFLAGS" -I$withval/include" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_init in -lspf" >&5 + $as_echo_n "checking for SPF_init in -lspf... " >&6; } +-if test "${ac_cv_lib_spf_SPF_init+set}" = set; then : ++if ${ac_cv_lib_spf_SPF_init+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6706,7 +6735,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf_SPF_init" >&5 + $as_echo "$ac_cv_lib_spf_SPF_init" >&6; } +-if test "x$ac_cv_lib_spf_SPF_init" = x""yes; then : ++if test "x$ac_cv_lib_spf_SPF_init" = xyes; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -6735,9 +6764,10 @@ SAVEDCFLAGS=$CFLAGS + if test "${with_libdkim+set}" = set; then : + withval=$with_libdkim; LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib" + CFLAGS=$CFLAGS" -I$withval/include" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -ldkim -lcrypto" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_dkim -lcrypto''_dkim_init" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -ldkim -lcrypto" >&5 + $as_echo_n "checking for dkim_init in -ldkim -lcrypto... " >&6; } +-if test "${ac_cv_lib_dkim__lcrypto_dkim_init+set}" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6761,17 +6791,18 @@ return dkim_init (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_dkim__lcrypto_dkim_init=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_dkim__lcrypto_dkim_init=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dkim__lcrypto_dkim_init" >&5 +-$as_echo "$ac_cv_lib_dkim__lcrypto_dkim_init" >&6; } +-if test "x$ac_cv_lib_dkim__lcrypto_dkim_init" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -6804,9 +6835,10 @@ if test "${with_libopendkim+set}" = set; then : + test -f $withval/$dir/dkim.h && dkim_include=$dir + done + CFLAGS=$CFLAGS" -I$withval/$dkim_include" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -lopendkim -lcrypto" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_opendkim -lcrypto''_dkim_init" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -lopendkim -lcrypto" >&5 + $as_echo_n "checking for dkim_init in -lopendkim -lcrypto... " >&6; } +-if test "${ac_cv_lib_opendkim__lcrypto_dkim_init+set}" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6830,17 +6862,18 @@ return dkim_init (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_opendkim__lcrypto_dkim_init=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_opendkim__lcrypto_dkim_init=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opendkim__lcrypto_dkim_init" >&5 +-$as_echo "$ac_cv_lib_opendkim__lcrypto_dkim_init" >&6; } +-if test "x$ac_cv_lib_opendkim__lcrypto_dkim_init" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + SAVEDLDFLAGS=$LDFLAGS + SAVEDCFLAGS=$CFLAGS +@@ -6889,7 +6922,7 @@ fi + # Check for socket functions linking. On Solaris, -lsocket -lnsl is required + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 + $as_echo_n "checking for socket in -lsocket... " >&6; } +-if test "${ac_cv_lib_socket_socket+set}" = set; then : ++if ${ac_cv_lib_socket_socket+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6923,12 +6956,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 + $as_echo "$ac_cv_lib_socket_socket" >&6; } +-if test "x$ac_cv_lib_socket_socket" = x""yes; then : ++if test "x$ac_cv_lib_socket_socket" = xyes; then : + LIBS="$LIBS -lsocket" + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket -lnsl" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_socket -lnsl''_socket" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket -lnsl" >&5 + $as_echo_n "checking for socket in -lsocket -lnsl... " >&6; } +-if test "${ac_cv_lib_socket__lnsl_socket+set}" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6952,17 +6986,18 @@ return socket (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_socket__lnsl_socket=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_socket__lnsl_socket=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket__lnsl_socket" >&5 +-$as_echo "$ac_cv_lib_socket__lnsl_socket" >&6; } +-if test "x$ac_cv_lib_socket__lnsl_socket" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LIBS="$LIBS -lsocket -lnsl" + fi + +@@ -6973,7 +7008,7 @@ fi + # Check for inet_aton (libmilter uses it). On solaris, -lresolv is required + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5 + $as_echo_n "checking for inet_aton in -lresolv... " >&6; } +-if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then : ++if ${ac_cv_lib_resolv_inet_aton+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7007,7 +7042,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5 + $as_echo "$ac_cv_lib_resolv_inet_aton" >&6; } +-if test "x$ac_cv_lib_resolv_inet_aton" = x""yes; then : ++if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then : + LIBS="$LIBS -lresolv" + fi + +@@ -7015,7 +7050,7 @@ fi + # Check for inet_pton (libmilter uses it). On solaris, -lnsl is required + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_pton in -lnsl" >&5 + $as_echo_n "checking for inet_pton in -lnsl... " >&6; } +-if test "${ac_cv_lib_nsl_inet_pton+set}" = set; then : ++if ${ac_cv_lib_nsl_inet_pton+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7049,7 +7084,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_inet_pton" >&5 + $as_echo "$ac_cv_lib_nsl_inet_pton" >&6; } +-if test "x$ac_cv_lib_nsl_inet_pton" = x""yes; then : ++if test "x$ac_cv_lib_nsl_inet_pton" = xyes; then : + LIBS="$LIBS -lnsl" + fi + +@@ -7168,14 +7203,14 @@ $as_echo "$res_nupdate" >&6; } + + + ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" +-if test "x$ac_cv_func_getaddrinfo" = x""yes; then : ++if test "x$ac_cv_func_getaddrinfo" = xyes; then : + ac_cv_lib_socket_getaddrinfo=no + ac_cv_lib_inet6_getaddrinfo=no + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -lsocket" >&5 + $as_echo_n "checking for getaddrinfo in -lsocket... " >&6; } +-if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then : ++if ${ac_cv_lib_socket_getaddrinfo+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7209,14 +7244,14 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getaddrinfo" >&5 + $as_echo "$ac_cv_lib_socket_getaddrinfo" >&6; } +-if test "x$ac_cv_lib_socket_getaddrinfo" = x""yes; then : ++if test "x$ac_cv_lib_socket_getaddrinfo" = xyes; then : + LIBS="$LIBS -lsocket" + ac_cv_lib_inet6_getaddrinfo=no + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5 + $as_echo_n "checking whether your system has IPv6 directory... " >&6; } +- if test "${ipv6_cv_dir+set}" = set; then : ++ if ${ipv6_cv_dir+:} false; then : + $as_echo_n "(cached) " >&6 + else + for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do +@@ -7237,7 +7272,7 @@ $as_echo "$ipv6_cv_dir" >&6; } + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -linet6" >&5 + $as_echo_n "checking for getaddrinfo in -linet6... " >&6; } +-if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then : ++if ${ac_cv_lib_inet6_getaddrinfo+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7271,7 +7306,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getaddrinfo" >&5 + $as_echo "$ac_cv_lib_inet6_getaddrinfo" >&6; } +-if test "x$ac_cv_lib_inet6_getaddrinfo" = x""yes; then : ++if test "x$ac_cv_lib_inet6_getaddrinfo" = xyes; then : + if test $ipv6_libinet6 = no; then + ipv6_libinet6=yes + LIBS="$LIBS -linet6" +@@ -7302,8 +7337,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then : + as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getaddrinfo" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + + fi + +@@ -7329,14 +7363,14 @@ fi + + + ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo" +-if test "x$ac_cv_func_getnameinfo" = x""yes; then : ++if test "x$ac_cv_func_getnameinfo" = xyes; then : + ac_cv_lib_socket_getnameinfo=no + ac_cv_lib_inet6_getnameinfo=no + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -lsocket" >&5 + $as_echo_n "checking for getnameinfo in -lsocket... " >&6; } +-if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then : ++if ${ac_cv_lib_socket_getnameinfo+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7370,14 +7404,14 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getnameinfo" >&5 + $as_echo "$ac_cv_lib_socket_getnameinfo" >&6; } +-if test "x$ac_cv_lib_socket_getnameinfo" = x""yes; then : ++if test "x$ac_cv_lib_socket_getnameinfo" = xyes; then : + LIBS="$LIBS -lsocket" + ac_cv_lib_inet6_getnameinfo=no + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5 + $as_echo_n "checking whether your system has IPv6 directory... " >&6; } +- if test "${ipv6_cv_dir+set}" = set; then : ++ if ${ipv6_cv_dir+:} false; then : + $as_echo_n "(cached) " >&6 + else + for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do +@@ -7398,7 +7432,7 @@ $as_echo "$ipv6_cv_dir" >&6; } + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -linet6" >&5 + $as_echo_n "checking for getnameinfo in -linet6... " >&6; } +-if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then : ++if ${ac_cv_lib_inet6_getnameinfo+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7432,7 +7466,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getnameinfo" >&5 + $as_echo "$ac_cv_lib_inet6_getnameinfo" >&6; } +-if test "x$ac_cv_lib_inet6_getnameinfo" = x""yes; then : ++if test "x$ac_cv_lib_inet6_getnameinfo" = xyes; then : + if test $ipv6_libinet6 = no; then + ipv6_libinet6=yes + LIBS="$LIBS -linet6" +@@ -7463,8 +7497,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then : + as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getnameinfo" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + + fi + +@@ -7690,7 +7723,7 @@ fi + # [-lsm] in the optionnal 5th argument does not seems to help at all. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smfi_register in -lmilter" >&5 + $as_echo_n "checking for smfi_register in -lmilter... " >&6; } +-if test "${ac_cv_lib_milter_smfi_register+set}" = set; then : ++if ${ac_cv_lib_milter_smfi_register+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7724,12 +7757,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_milter_smfi_register" >&5 + $as_echo "$ac_cv_lib_milter_smfi_register" >&6; } +-if test "x$ac_cv_lib_milter_smfi_register" = x""yes; then : ++if test "x$ac_cv_lib_milter_smfi_register" = xyes; then : + LIBS="$LIBS -lmilter" + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smfi_register in -lmilter -lsm" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_milter -lsm''_smfi_register" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for smfi_register in -lmilter -lsm" >&5 + $as_echo_n "checking for smfi_register in -lmilter -lsm... " >&6; } +-if test "${ac_cv_lib_milter__lsm_smfi_register+set}" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7753,22 +7787,24 @@ return smfi_register (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_milter__lsm_smfi_register=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_milter__lsm_smfi_register=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_milter__lsm_smfi_register" >&5 +-$as_echo "$ac_cv_lib_milter__lsm_smfi_register" >&6; } +-if test "x$ac_cv_lib_milter__lsm_smfi_register" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LIBS="$LIBS -lmilter -lsm" + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smfi_register in -lmilter -lsmutil" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_milter -lsmutil''_smfi_register" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for smfi_register in -lmilter -lsmutil" >&5 + $as_echo_n "checking for smfi_register in -lmilter -lsmutil... " >&6; } +-if test "${ac_cv_lib_milter__lsmutil_smfi_register+set}" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7792,17 +7828,18 @@ return smfi_register (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_milter__lsmutil_smfi_register=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_milter__lsmutil_smfi_register=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_milter__lsmutil_smfi_register" >&5 +-$as_echo "$ac_cv_lib_milter__lsmutil_smfi_register" >&6; } +-if test "x$ac_cv_lib_milter__lsmutil_smfi_register" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LIBS="$LIBS -lmilter -lsmutil" + else + echo "Required libmilter not found. Use --with-libmilter"; +@@ -7818,7 +7855,7 @@ fi + + ac_fn_c_check_member "$LINENO" "struct smfiDesc" "xxfi_data" "ac_cv_member_struct_smfiDesc_xxfi_data" "#include + " +-if test "x$ac_cv_member_struct_smfiDesc_xxfi_data" = x""yes; then : ++if test "x$ac_cv_member_struct_smfiDesc_xxfi_data" = xyes; then : + CFLAGS=$CFLAGS" -DHAVE_DATA_CALLBACK" + fi + +@@ -8090,7 +8127,7 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_s + #include + + " +-if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then : ++if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then : + + $as_echo "#define HAVE_SA_LEN /**/" >>confdefs.h + +@@ -8104,7 +8141,7 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_memb + #include + + " +-if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = x""yes; then : ++if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = xyes; then : + + $as_echo "#define HAVE_SIN6_SCOPE_ID 1" >>confdefs.h + +@@ -8148,8 +8185,8 @@ brokenpth=yes + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5; } + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -8340,7 +8377,7 @@ if ac_fn_c_try_link "$LINENO"; then : + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ns_initparse in -lresolv" >&5 + $as_echo_n "checking for ns_initparse in -lresolv... " >&6; } +-if test "${ac_cv_lib_resolv_ns_initparse+set}" = set; then : ++if ${ac_cv_lib_resolv_ns_initparse+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8374,7 +8411,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_ns_initparse" >&5 + $as_echo "$ac_cv_lib_resolv_ns_initparse" >&6; } +-if test "x$ac_cv_lib_resolv_ns_initparse" = x""yes; then : ++if test "x$ac_cv_lib_resolv_ns_initparse" = xyes; then : + LIBS="$LIBS -lresolv" + else + +@@ -8427,7 +8464,7 @@ if ac_fn_c_try_link "$LINENO"; then : + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ns_initparse in -lresolv" >&5 + $as_echo_n "checking for ns_initparse in -lresolv... " >&6; } +-if test "${ac_cv_lib_resolv_ns_initparse+set}" = set; then : ++if ${ac_cv_lib_resolv_ns_initparse+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8461,7 +8498,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_ns_initparse" >&5 + $as_echo "$ac_cv_lib_resolv_ns_initparse" >&6; } +-if test "x$ac_cv_lib_resolv_ns_initparse" = x""yes; then : ++if test "x$ac_cv_lib_resolv_ns_initparse" = xyes; then : + LIBS="$LIBS -lresolv" + else + +@@ -8629,10 +8666,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + :end' >>confcache + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then +- test "x$cache_file" != "x/dev/null" && ++ if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + $as_echo "$as_me: updating cache $cache_file" >&6;} +- cat confcache >$cache_file ++ if test ! -f "$cache_file" || test -h "$cache_file"; then ++ cat confcache >"$cache_file" ++ else ++ case $cache_file in #( ++ */* | ?:*) ++ mv -f confcache "$cache_file"$$ && ++ mv -f "$cache_file"$$ "$cache_file" ;; #( ++ *) ++ mv -f confcache "$cache_file" ;; ++ esac ++ fi ++ fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} +@@ -8648,6 +8696,7 @@ DEFS=-DHAVE_CONFIG_H + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +@@ -8663,7 +8712,7 @@ LTLIBOBJS=$ac_ltlibobjs + + + +-: ${CONFIG_STATUS=./config.status} ++: "${CONFIG_STATUS=./config.status}" + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +@@ -8764,6 +8813,7 @@ fi + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. ++as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -8809,19 +8859,19 @@ export LANGUAGE + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -8959,16 +9009,16 @@ if (echo >conf$$.file) 2>/dev/null; then + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -9017,7 +9067,7 @@ $as_echo X"$as_dir" | + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -9028,28 +9078,16 @@ else + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in #( +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++ ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -9071,7 +9109,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # values after options handling. + ac_log=" + This file was extended by milter-greylist $as_me 4.6.2, which was +-generated by GNU Autoconf 2.65. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -9133,10 +9171,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + milter-greylist config.status 4.6.2 +-configured by $0, generated by GNU Autoconf 2.65, ++configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2012 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -9152,11 +9190,16 @@ ac_need_defaults=: + while test $# != 0 + do + case $1 in +- --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 +@@ -9178,6 +9221,7 @@ do + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; +@@ -9190,7 +9234,7 @@ do + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- as_fn_error "ambiguous option: \`$1' ++ as_fn_error $? "ambiguous option: \`$1' + Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; +@@ -9199,7 +9243,7 @@ Try \`$0 --help' for more information.";; + ac_cs_silent=: ;; + + # This is an error. +- -*) as_fn_error "unrecognized option: \`$1' ++ -*) as_fn_error $? "unrecognized option: \`$1' + Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" +@@ -9219,7 +9263,7 @@ fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' +@@ -9252,7 +9296,7 @@ do + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "milter-greylist.spec") CONFIG_FILES="$CONFIG_FILES milter-greylist.spec" ;; + +- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -9274,9 +9318,10 @@ fi + # after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- tmp= ++ tmp= ac_tmp= + trap 'exit_status=$? +- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++ : "${ac_tmp:=$tmp}" ++ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + ' 0 + trap 'as_fn_exit 1' 1 2 13 15 + } +@@ -9284,12 +9329,13 @@ $debug || + + { + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && +- test -n "$tmp" && test -d "$tmp" ++ test -d "$tmp" + } || + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 ++ac_tmp=$tmp + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -9306,12 +9352,12 @@ if test "x$ac_cr" = x; then + fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\r' ++ ac_cs_awk_cr='\\r' + else + ac_cs_awk_cr=$ac_cr + fi + +-echo 'BEGIN {' >"$tmp/subs1.awk" && ++echo 'BEGIN {' >"$ac_tmp/subs1.awk" && + _ACEOF + + +@@ -9320,18 +9366,18 @@ _ACEOF + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -9339,7 +9385,7 @@ done + rm -f conf$$subs.sh + + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && + _ACEOF + sed -n ' + h +@@ -9387,7 +9433,7 @@ t delim + rm -f conf$$subs.awk + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + _ACAWK +-cat >>"\$tmp/subs1.awk" <<_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +@@ -9419,21 +9465,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" + else + cat +-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || as_fn_error "could not setup config files machinery" "$LINENO" 5 ++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + _ACEOF + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ ++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// + s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// + s/^[^=]*=[ ]*$// + }' + fi +@@ -9445,7 +9499,7 @@ fi # test -n "$CONFIG_FILES" + # No need to generate them if there are no CONFIG_HEADERS. + # This happens for instance with `./config.status Makefile'. + if test -n "$CONFIG_HEADERS"; then +-cat >"$tmp/defines.awk" <<\_ACAWK || ++cat >"$ac_tmp/defines.awk" <<\_ACAWK || + BEGIN { + _ACEOF + +@@ -9457,11 +9511,11 @@ _ACEOF + # handling of long lines. + ac_delim='%!_!# ' + for ac_last_try in false false :; do +- ac_t=`sed -n "/$ac_delim/p" confdefs.h` +- if test -z "$ac_t"; then ++ ac_tt=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_tt"; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -9546,7 +9600,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- as_fn_error "could not setup config headers machinery" "$LINENO" 5 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -9559,7 +9613,7 @@ do + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -9578,7 +9632,7 @@ do + for ac_f + do + case $ac_f in +- -) ac_f="$tmp/stdin";; ++ -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. +@@ -9587,7 +9641,7 @@ do + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" +@@ -9613,8 +9667,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} + esac + + case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; ++ *:-:* | *:-) cat >"$ac_tmp/stdin" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -9744,23 +9798,24 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t + $ac_datarootdir_hack + " +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ ++ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && +- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && +- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ ++ "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&5 ++which seems to be undefined. Please make sure it is defined" >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&2;} ++which seems to be undefined. Please make sure it is defined" >&2;} + +- rm -f "$tmp/stdin" ++ rm -f "$ac_tmp/stdin" + case $ac_file in +- -) cat "$tmp/out" && rm -f "$tmp/out";; +- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; ++ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; ++ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -9769,21 +9824,21 @@ which seems to be undefined. Please make sure it is defined." >&2;} + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" +- } >"$tmp/config.h" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 +- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then ++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" ++ } >"$ac_tmp/config.h" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" +- mv "$tmp/config.h" "$ac_file" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ mv "$ac_tmp/config.h" "$ac_file" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || as_fn_error "could not create -" "$LINENO" 5 ++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ ++ || as_fn_error $? "could not create -" "$LINENO" 5 + fi + ;; + +@@ -9798,7 +9853,7 @@ _ACEOF + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -9819,7 +9874,7 @@ if test "$no_create" != yes; then + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || as_fn_exit $? ++ $ac_cs_success || as_fn_exit 1 + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +--- greylist.conf.5 ++++ greylist.conf.5 +@@ -198,8 +198,6 @@ is used when the country cannot be determined (this happens for private + addresses, for instance). The + .I geoipdb + statement can be used to specify the location of GeoIP database. +-.I geoipv6db +-statement can be used to specify the location of GeoIPv6 database. + .TP + .I p0f + This is used to match against the remote system OS fingerprint genre and +--- milter-greylist.spec ++++ milter-greylist.spec +@@ -19,8 +19,8 @@ + %define libspf2 0 + %{?build_libspf2:%define libspf2 1} + +-%define libGeoIP 0 +-%{?build_libGeoIP:%define libGeoIP 1} ++%define libmaxminddb 0 ++%{?build_libmaxminddb:%define libmaxminddb 1} + + %define libcurl 0 + %{?build_libcurl:%define libcurl 1} +@@ -66,8 +66,8 @@ BuildRequires: libspf2-devel + %if %{libcurl} + BuildRequires: curl-devel + %endif +-%if %{libGeoIP} +-BuildRequires: GeoIP-devel ++%if %{libmaxminddb} ++BuildRequires: libmaxminddb-devel + %endif + + %description +@@ -111,8 +111,8 @@ before the second attempt. + %if %{libcurl} + --with-libcurl \ + %endif +-%if %{libGeoIP} +- --with-libGeoIP \ ++%if %{libmaxminddb} ++ --with-libmaxminddb \ + %endif + %if %{libdkim} + --with-libdkim=/usr/include \ +--- geoip.c.orig 2016-11-24 04:11:37.000000000 +0000 ++++ geoip.c 2019-07-20 10:40:23.804734000 +0000 +@@ -48,7 +48,7 @@ + #include + #include + +-#include ++#include + + #include "milter-greylist.h" + #include "conf.h" +@@ -58,10 +58,9 @@ + #include + #endif + +-static GeoIP *geoip_handle = NULL; +-static GeoIP *geoip_handle_v6 = NULL; ++static MMDB_s mmdb; ++static MMDB_s *geoip_handle = &mmdb; + static char geoip_database[MAXPATHLEN + 1]; +-static char geoip_database_v6[MAXPATHLEN + 1]; + static pthread_rwlock_t geoip_lock; + + void +@@ -83,43 +82,21 @@ + char *name; + { + if (geoip_handle != NULL) { +- GeoIP_delete(geoip_handle); +- geoip_handle = NULL; ++ MMDB_close(geoip_handle); + } + + strncpy(geoip_database, name, MAXPATHLEN); + geoip_database[MAXPATHLEN] = '\0'; + +- geoip_handle = GeoIP_open(geoip_database, GEOIP_STANDARD); +- if (geoip_handle == NULL) { ++ int status = MMDB_open(geoip_database, MMDB_MODE_MMAP, geoip_handle); ++ if (status != MMDB_SUCCESS) { + mg_log(LOG_WARNING, +- "GeoIP databade \"%s\" cannot be used", ++ "GeoIP database \"%s\" cannot be used", + geoip_database); + return; + } + } + +-void +-geoip_set_db_v6(name) +- char *name; +-{ +- if (geoip_handle_v6 != NULL) { +- GeoIP_delete(geoip_handle_v6); +- geoip_handle_v6 = NULL; +- } +- +- strncpy(geoip_database_v6, name, MAXPATHLEN); +- geoip_database_v6[MAXPATHLEN] = '\0'; +- +- geoip_handle_v6 = GeoIP_open(geoip_database_v6, GEOIP_STANDARD); +- if (geoip_handle_v6 == NULL) { +- mg_log(LOG_WARNING, +- "GeoIPv6 databade \"%s\" cannot be used", +- geoip_database_v6); +- return; +- } +-} +- + int + geoip_filter(ad, stage, ap, priv) + acl_data_t *ad; +@@ -142,33 +119,9 @@ + geoip_set_ccode(priv) + struct mlfi_priv *priv; + { +- GEOIP_API const char *(*country_code_by_addr)(GeoIP *, const char *); +- GeoIP *handle; + char ipstr[IPADDRSTRLEN]; ++ int gai_error, mmdb_error; + +- switch (SA(&priv->priv_addr)->sa_family) { +- case AF_INET: +- country_code_by_addr = GeoIP_country_code_by_addr; +- handle = geoip_handle; +- break; +-#ifdef AF_INET6 +- case AF_INET6: +- country_code_by_addr = GeoIP_country_code_by_addr_v6; +- handle = geoip_handle_v6; +- break; +-#endif +- default: +- mg_log(LOG_DEBUG, "GeoIP not supported address family"); +- priv->priv_ccode = NULL; +- return; +- } +- +- if (geoip_handle == NULL) { +- mg_log(LOG_DEBUG, "GeoIP is not available"); +- priv->priv_ccode = NULL; +- return; +- } +- + if (iptostring(SA(&priv->priv_addr), + priv->priv_addrlen, ipstr, sizeof(ipstr)) == NULL) { + mg_log(LOG_DEBUG, "GeoIP iptostring failed"); +@@ -177,7 +130,19 @@ + } + + WRLOCK(geoip_lock); +- priv->priv_ccode = country_code_by_addr(handle, ipstr); ++ MMDB_lookup_result_s result = MMDB_lookup_string(geoip_handle, ipstr, &gai_error, &mmdb_error); ++ if (gai_error == 0) { ++ if (mmdb_error == MMDB_SUCCESS) { ++ MMDB_entry_data_s entry_data; ++ int status = MMDB_get_value(&result.entry, &entry_data, "country", "iso_code", NULL); ++ if (status == MMDB_SUCCESS) { ++ if (entry_data.has_data) { ++ priv->priv_ccode = strndup(entry_data.utf8_string, entry_data.data_size); ++ } ++ } ++ } ++ } ++ + UNLOCK(geoip_lock); + + if (priv->priv_ccode == NULL) Property changes on: files/patch-libmaxminddb-support_from_GH-geoip2-fork ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property