head 1.12; access; symbols OPENPKG_E1_MP_HEAD:1.7 OPENPKG_E1_MP:1.7 OPENPKG_E1_MP_2_STABLE:1.5.14.1 OPENPKG_E1_FP:1.5.14.1 OPENPKG_2_STABLE_MP:1.7 OPENPKG_2_STABLE_20061018:1.5.14.1 OPENPKG_2_STABLE:1.5.0.14 OPENPKG_2_STABLE_BP:1.5 OPENPKG_2_5_SOLID:1.5.0.12 OPENPKG_2_5_SOLID_BP:1.5 OPENPKG_2_4_RELEASE:1.5 OPENPKG_2_4_SOLID:1.5.0.10 OPENPKG_2_4_SOLID_BP:1.5 OPENPKG_2_3_RELEASE:1.5 OPENPKG_2_3_SOLID:1.5.0.8 OPENPKG_2_3_SOLID_BP:1.5 OPENPKG_2_2_RELEASE:1.5 OPENPKG_2_2_SOLID:1.5.0.6 OPENPKG_2_2_SOLID_BP:1.5 OPENPKG_2_1_RELEASE:1.5 OPENPKG_2_1_SOLID:1.5.0.4 OPENPKG_2_1_SOLID_BP:1.5 OPENPKG_2_0_RELEASE:1.5 OPENPKG_2_0_SOLID:1.5.0.2 OPENPKG_2_0_SOLID_BP:1.5 OPENPKG_1_3_RELEASE:1.2 OPENPKG_1_3_SOLID:1.2.0.6 OPENPKG_1_3_SOLID_BP:1.2 OPENPKG_1_2_SOLID:1.2.0.4 OPENPKG_1_2_SOLID_BP:1.2 OPENPKG_1_STABLE:1.2.0.2 OPENPKG_1_STABLE_BP:1.2 OPENPKG_1_0_RELEASE:1.1.1.1 OPENPKG_1_0_SOLID:1.1.1.1.0.2 OPENPKG_1_0_SOLID_BP:1.1.1.1 OPENPKG_0_0:1.1.1.1 OPENPKG:1.1.1; locks; strict; comment @# @; 1.12 date 2008.12.24.20.28.57; author rse; state Exp; branches; next 1.11; commitid F3kdzDBAqa1HaLvt; 1.11 date 2008.11.28.07.21.24; author rse; state Exp; branches; next 1.10; commitid yoyLqeaRRT6kElst; 1.10 date 2008.11.26.19.49.09; author rse; state Exp; branches; next 1.9; commitid IlmHuMaH07VPQ9st; 1.9 date 2008.07.25.05.49.05; author rse; state Exp; branches; next 1.8; commitid dfJOz5VMMpIKb9ct; 1.8 date 2008.05.08.18.39.54; author rse; state Exp; branches; next 1.7; commitid WPxms2dyYyTDXb2t; 1.7 date 2006.11.03.23.17.05; author rse; state dead; branches; next 1.6; commitid JOi51ryxoMMNehTr; 1.6 date 2006.09.07.06.25.47; author rse; state Exp; branches; next 1.5; commitid 2pYMwUqfyhuttRLr; 1.5 date 2003.04.29.22.30.16; author mlelstv; state dead; branches 1.5.12.1 1.5.14.1; next 1.4; 1.4 date 2003.04.13.18.25.20; author mlelstv; state Exp; branches; next 1.3; 1.3 date 2003.03.05.12.14.23; author mlelstv; state Exp; branches; next 1.2; 1.2 date 2002.02.06.16.09.04; author rse; state dead; branches; next 1.1; 1.1 date 2001.09.18.09.48.28; author rse; state Exp; branches 1.1.1.1; next ; 1.5.12.1 date 2006.09.07.06.32.26; author rse; state Exp; branches; next ; commitid FJyipSmkps0KvRLr; 1.5.14.1 date 2006.09.07.06.27.15; author rse; state Exp; branches; next 1.5.14.2; commitid 1vqFmX1O60uYtRLr; 1.5.14.2 date 2006.11.04.08.19.02; author rse; state dead; branches; next ; commitid rhnXyS6TBTKJekTr; 1.1.1.1 date 2001.09.18.09.48.28; author rse; state Exp; branches; next ; desc @@ 1.12 log @upgrading package: bind 9.5.0p2 -> 9.6.0 @ text @Index: bin/named/unix/os.c --- bin/named/unix/os.c.orig 2008-05-06 03:32:51 +0200 +++ bin/named/unix/os.c 2008-07-25 07:47:14 +0200 @@@@ -261,6 +261,13 @@@@ SET_CAP(CAP_SETGID); /* + * Since we call chown, we need this. + */ +#if defined(CAP_CHOWN) + SET_CAP(CAP_CHOWN); +#endif + + /* * Without this, we run into problems reading a configuration file * owned by a non-root user and non-world-readable on startup. */ ----------------------------------------------------------------------------- As mentioned in http://article.gmane.org/gmane.network.dns.bind9.dlz/1900, the '%' symbol is used to escape characters in LDAP URL's. This patch replaces '%' with '$'. Without this patch BIND+dlz_ldap doesn't work. As mentionned in http://groups.google.com/group/comp.protocols.dns.bind/browse_thread/thread/5a6cb9a54b56b199 "Assertion debug information" without this patch BIND+dlz crashes when doing zone transfer request ("host -la domain server") Index: contrib/dlz/drivers/sdlz_helper.c --- contrib/dlz/drivers/sdlz_helper.c.orig 2005-09-05 02:10:57 +0200 +++ contrib/dlz/drivers/sdlz_helper.c 2008-11-26 20:46:52 +0100 @@@@ -166,12 +166,12 @@@@ ISC_LIST_APPEND(*tql, tseg, link); /* - * split string at the first "%". set query segment to + * split string at the first "$". set query segment to * left portion */ tseg->sql = isc_mem_strdup(mctx, isc_string_separate(&right_str, - "%")); + "$")); if (tseg->sql == NULL) { /* no memory, clean everything up. */ result = ISC_R_NOMEMORY; Index: bin/named/xfrout.c --- bin/named/xfrout.c.orig 2008-04-03 08:20:33.000000000 +0200 +++ bin/named/xfrout.c 2008-11-27 08:58:20.000000000 +0100 @@@@ -1744,6 +1745,7 @@@@ xfrout_senddone(isc_task_t *task, isc_ev sendstream(xfr); } else { /* End of zone transfer stream. */ + if (xfr->zone != NULL) inc_stats(xfr->zone, dns_nsstatscounter_xfrdone); xfrout_log(xfr, ISC_LOG_INFO, "%s ended", xfr->mnemonic); ns_client_next(xfr->client, ISC_R_SUCCESS); @ 1.11 log @apply one more DLZ patch @ text @a49 8 @@@@ -1333,6 +1333,7 @@@@ xfrout_ctx_create(isc_mem_t *mctx, ns_cl xfr->zone = NULL; xfr->db = NULL; xfr->ver = NULL; + if (zone != NULL) /* zone will be NULL if it's DLZ */ dns_zone_attach(zone, &xfr->zone); dns_db_attach(db, &xfr->db); dns_db_attachversion(db, ver, &xfr->ver); @ 1.10 log @apply a fix for with_ldap=yes @ text @d25 4 d47 19 @ 1.9 log @adjust patch for BIND 9.5.0 world order @ text @d18 25 @ 1.8 log @fix Unix domain socket usage under Linux @ text @d2 4 a5 4 --- bin/named/unix/os.c.orig 2006-02-04 00:51:38 +0100 +++ bin/named/unix/os.c 2008-05-02 17:25:33 +0200 @@@@ -212,6 +212,11 @@@@ caps |= (1 << CAP_SETGID); d10 3 a12 1 + caps |= (1 << CAP_CHOWN); @ 1.7 log @upgrade to latest security fixed patchlevel 2 of BIND 9.3.2 @ text @d1 5 a5 9 Security Fixes (BIND 9.3.2-P1): - SIG Query Processing (CVE-2006-4095) - Excessive Recursive Queries INSIST failure (CVE-2006-4096) Index: bin/named/query.c --- bin/named/query.c.orig 2005-08-11 07:25:20 +0200 +++ bin/named/query.c 2006-09-07 08:14:50 +0200 @@@@ -2393,7 +2393,7 @@@@ is_zone = ISC_FALSE; a6 7 qtype = event->qtype; - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; @@@@ -2434,7 +2434,7 @@@@ d8 7 a14 1 * If it's a SIG query, we'll iterate the node. a15 130 - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; Index: lib/dns/resolver.c --- lib/dns/resolver.c.orig 2005-10-14 03:38:48 +0200 +++ lib/dns/resolver.c 2006-09-07 08:14:50 +0200 @@@@ -762,7 +762,8 @@@@ INSIST(result != ISC_R_SUCCESS || dns_rdataset_isassociated(event->rdataset) || fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig); + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig); isc_task_sendanddetach(&task, ISC_EVENT_PTR(&event)); } @@@@ -3188,7 +3189,8 @@@@ if (hevent != NULL) { if (!negative && !chaining && (fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig)) { + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig)) { /* * Don't bind rdatasets; the caller * will iterate the node. @@@@ -3306,7 +3308,8 @@@@ if (!ISC_LIST_EMPTY(fctx->validators)) { INSIST(!negative); INSIST(fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig); + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig); /* * Don't send a response yet - we have * more rdatasets that still need to @@@@ -3455,14 +3458,15 @@@@ return (result); anodep = &event->node; /* - * If this is an ANY or SIG query, we're not going - * to return any rdatasets, unless we encountered + * If this is an ANY, SIG or RRSIG query, we're not + * going to return any rdatasets, unless we encountered * a CNAME or DNAME as "the answer". In this case, * we're going to return DNS_R_CNAME or DNS_R_DNAME * and we must set up the rdatasets. */ if ((fctx->type != dns_rdatatype_any && - fctx->type != dns_rdatatype_rrsig) || + fctx->type != dns_rdatatype_rrsig && + fctx->type != dns_rdatatype_sig) || (name->attributes & DNS_NAMEATTR_CHAINING) != 0) { ardataset = event->rdataset; asigrdataset = event->sigrdataset; @@@@ -3521,7 +3525,7 @@@@ */ if (secure_domain && rdataset->trust != dns_trust_glue) { /* - * SIGs are validated as part of validating the + * RRSIGs are validated as part of validating the * type they cover. */ if (rdataset->type == dns_rdatatype_rrsig) @@@@ -3591,7 +3595,8 @@@@ if (ANSWER(rdataset) && need_validation) { if (fctx->type != dns_rdatatype_any && - fctx->type != dns_rdatatype_rrsig) { + fctx->type != dns_rdatatype_rrsig && + fctx->type != dns_rdatatype_sig) { /* * This is The Answer. We will * validate it, but first we cache @@@@ -3763,23 +3768,28 @@@@ isc_result_t *eresultp) { isc_result_t result; + dns_rdataset_t rdataset; + + if (ardataset == NULL) { + dns_rdataset_init(&rdataset); + ardataset = &rdataset; + } result = dns_ncache_add(message, cache, node, covers, now, maxttl, ardataset); - if (result == DNS_R_UNCHANGED) { + if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) { /* - * The data in the cache are better than the negative cache - * entry we're trying to add. + * If the cache now contains a negative entry and we + * care about whether it is DNS_R_NCACHENXDOMAIN or + * DNS_R_NCACHENXRRSET then extract it. */ - if (ardataset != NULL && ardataset->type == 0) { + if (ardataset->type == 0) { /* - * The cache data is also a negative cache - * entry. + * The cache data is a negative cache entry. */ if (NXDOMAIN(ardataset)) *eresultp = DNS_R_NCACHENXDOMAIN; else *eresultp = DNS_R_NCACHENXRRSET; - result = ISC_R_SUCCESS; } else { /* * Either we don't care about the nature of the @@@@ -3791,14 +3801,11 @@@@ * XXXRTH There's a CNAME/DNAME problem here. */ *eresultp = ISC_R_SUCCESS; - result = ISC_R_SUCCESS; } - } else if (result == ISC_R_SUCCESS) { - if (NXDOMAIN(ardataset)) - *eresultp = DNS_R_NCACHENXDOMAIN; - else - *eresultp = DNS_R_NCACHENXRRSET; + result = ISC_R_SUCCESS; } + if (ardataset == &rdataset && dns_rdataset_isassociated(ardataset)) + dns_rdataset_disassociate(ardataset); return (result); } @ 1.6 log @apply vendor security fixes (CVE-2006-4095, CVE-2006-4096) @ text @@ 1.5 log @remove patch for DLZ-patch since it now applies directly to bind-9.2.2. fix DLZ-patch for non-bdb builds @ text @d1 9 a9 3245 --- dlz.patch.dist Wed Apr 9 00:28:46 2003 +++ dlz.patch Sun Apr 13 17:44:54 2003 @@@@ -6876,3219 +6876,6 @@@@ stream = NULL; db = NULL; ver = NULL; -diff -Naur bind-9.2.1-orig/configure bind-9.2.1/configure ---- bind-9.2.1-orig/configure Tue Dec 4 20:30:08 2001 -+++ bind-9.2.1/configure Wed Apr 9 18:02:11 2003 -@@@@ -179,6 +179,21 @@@@ - ac_default_prefix=/usr/local - # Any additions from configure.in: - ac_help="$ac_help -+ --with-dlz-postgres[=PATH] Build with Postgres DLZ driver [yes|no|path]. -+ (Required to use Postgres with DLZ)" -+ac_help="$ac_help -+ --with-dlz-mysql[=PATH] Build with MySQL DLZ driver [yes|no|path]. -+ (Required to use MySQL with DLZ)" -+ac_help="$ac_help -+ --with-dlz-bdb[=PATH] Build with Berkeley DB DLZ driver [yes|no|path]. -+ (Required to use Berkeley DB with DLZ)" -+ac_help="$ac_help -+ --with-dlz-filesystem[=PATH] Build with filesystem DLZ driver [yes|no]. -+ (Required to use file system driver with DLZ)" -+ac_help="$ac_help -+ --with-dlz-stub[=PATH] Build with stub DLZ driver [yes|no]. -+ (Required to use stub driver with DLZ)" -+ac_help="$ac_help - --with-openssl[=PATH] Build with OpenSSL [yes|no|path]. - (Required for DNSSEC)" - ac_help="$ac_help -@@@@ -911,7 +926,7 @@@@ - fi - - echo $ac_n "checking host system type""... $ac_c" 1>&6 --echo "configure:915: checking host system type" >&5 -+echo "configure:930: checking host system type" >&5 - - host_alias=$host - case "$host_alias" in -@@@@ -933,7 +948,7 @@@@ - - - echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 --echo "configure:937: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "configure:952: checking whether ${MAKE-make} sets \${MAKE}" >&5 - set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -962,7 +977,7 @@@@ - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:966: checking for $ac_word" >&5 -+echo "configure:981: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -1001,7 +1016,7 @@@@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:1005: checking for a BSD compatible install" >&5 -+echo "configure:1020: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -1062,7 +1077,7 @@@@ - # Extract the first word of "ar", so it can be a program name with args. - set dummy ar; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1066: checking for $ac_word" >&5 -+echo "configure:1081: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -1121,7 +1136,7 @@@@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1125: checking for $ac_word" >&5 -+echo "configure:1140: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_ETAGS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -1163,7 +1178,7 @@@@ - # - if test "X$ETAGS" != "X"; then - echo $ac_n "checking for Exuberant Ctags etags""... $ac_c" 1>&6 --echo "configure:1167: checking for Exuberant Ctags etags" >&5 -+echo "configure:1182: checking for Exuberant Ctags etags" >&5 - if $ETAGS --version 2>&1 | grep 'Exuberant Ctags' >/dev/null 2>&1; then - echo "$ac_t""yes" 1>&6 - ETAGS="$ETAGS -L" -@@@@ -1181,7 +1196,7 @@@@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1185: checking for $ac_word" >&5 -+echo "configure:1200: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -1328,7 +1343,7 @@@@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1332: checking for $ac_word" >&5 -+echo "configure:1347: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -1358,7 +1373,7 @@@@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1362: checking for $ac_word" >&5 -+echo "configure:1377: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -1409,7 +1424,7 @@@@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1413: checking for $ac_word" >&5 -+echo "configure:1428: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -1441,7 +1456,7 @@@@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1445: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:1460: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@@@ -1452,12 +1467,12 @@@@ - - cat > conftest.$ac_ext << EOF - --#line 1456 "configure" -+#line 1471 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@@@ -1483,12 +1498,12 @@@@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1487: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1502: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:1492: checking whether we are using GNU C" >&5 -+echo "configure:1507: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -1497,7 +1512,7 @@@@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@@@ -1516,7 +1531,7 @@@@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:1520: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:1535: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -1549,7 +1564,7 @@@@ - - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:1553: checking how to run the C preprocessor" >&5 -+echo "configure:1568: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@@@ -1564,13 +1579,13 @@@@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@@@ -1581,13 +1596,13 @@@@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@@@ -1598,13 +1613,13 @@@@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@@@ -1629,12 +1644,12 @@@@ - echo "$ac_t""$CPP" 1>&6 - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1633: checking for ANSI C header files" >&5 -+echo "configure:1648: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@@@ -1642,7 +1657,7 @@@@ - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@@@ -1659,7 +1674,7 @@@@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@@@ -1677,7 +1692,7 @@@@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@@@ -1698,7 +1713,7 @@@@ - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@@@ -1709,7 +1724,7 @@@@ - exit (0); } - - EOF --if { (eval echo configure:1713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@@@ -1737,17 +1752,17 @@@@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1741: checking for $ac_hdr" >&5 -+echo "configure:1756: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@@@ -1775,12 +1790,12 @@@@ - - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:1779: checking for working const" >&5 -+echo "configure:1794: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@@@ -1850,21 +1865,21 @@@@ - fi - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:1854: checking for inline" >&5 -+echo "configure:1869: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@@@ -1890,12 +1905,12 @@@@ - esac - - echo $ac_n "checking for sysctlbyname""... $ac_c" 1>&6 --echo "configure:1894: checking for sysctlbyname" >&5 -+echo "configure:1909: checking for sysctlbyname" >&5 - if eval "test \"`echo '$''{'ac_cv_func_sysctlbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_sysctlbyname=yes" - else -@@@@ -1946,9 +1961,9 @@@@ - # is reported to not support "static inline" (RT #1212). - # - echo $ac_n "checking for static inline breakage""... $ac_c" 1>&6 --echo "configure:1950: checking for static inline breakage" >&5 -+echo "configure:1965: checking for static inline breakage" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""no" 1>&6 - else -@@@@ -1981,12 +1996,12 @@@@ - rm -f conftest* - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:1985: checking for size_t" >&5 -+echo "configure:2000: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@@@ -2014,12 +2029,12 @@@@ - fi - - echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 --echo "configure:2018: checking for ssize_t" >&5 -+echo "configure:2033: checking for ssize_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@@@ -2047,12 +2062,12 @@@@ - fi - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:2051: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:2066: checking whether time.h and sys/time.h may both be included" >&5 - if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@@@ -2061,7 +2076,7 @@@@ - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:2065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes - else -@@@@ -2082,16 +2097,16 @@@@ - fi - - echo $ac_n "checking for long long""... $ac_c" 1>&6 --echo "configure:2086: checking for long long" >&5 -+echo "configure:2101: checking for long long" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_HAVELONGLONG="#define ISC_PLATFORM_HAVELONGLONG 1" -@@@@ -2111,9 +2126,9 @@@@ - case $ac_cv_header_unistd_h in - yes) - echo $ac_n "checking if unistd.h defines fd_set""... $ac_c" 1>&6 --echo "configure:2115: checking if unistd.h defines fd_set" >&5 -+echo "configure:2130: checking if unistd.h defines fd_set" >&5 - cat > conftest.$ac_ext < -@@@@ -2121,7 +2136,7 @@@@ - fd_set read_set; return (0); - ; return 0; } - EOF --if { (eval echo configure:2125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_NEEDSYSSELECTH="#undef ISC_PLATFORM_NEEDSYSSELECTH" -@@@@ -2163,14 +2178,14 @@@@ - # Find the machine's endian flavor. - # - echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 --echo "configure:2167: checking whether byte ordering is bigendian" >&5 -+echo "configure:2182: checking whether byte ordering is bigendian" >&5 - if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_bigendian=unknown - # See if sys/param.h defines the BYTE_ORDER macro. - cat > conftest.$ac_ext < - #include -@@@@ -2181,11 +2196,11 @@@@ - #endif - ; return 0; } - EOF --if { (eval echo configure:2185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - # It does; now see whether it defined to BIG_ENDIAN or not. - cat > conftest.$ac_ext < - #include -@@@@ -2196,7 +2211,7 @@@@ - #endif - ; return 0; } - EOF --if { (eval echo configure:2200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_bigendian=yes - else -@@@@ -2216,7 +2231,7 @@@@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_bigendian=no - else -@@@@ -2254,10 +2269,256 @@@@ - - - # -+# Build DLZ support? -+# -+# The use_dlz flag is set to no. If one of the DLZ drivers is selected -+# for build the use_dlz flag will be set to yes -+# -+ -+use_dlz=no -+ -+# -+# was --with-dlz-postgres specified? -+# -+ -+echo $ac_n "checking for Postgres DLZ driver""... $ac_c" 1>&6 -+echo "configure:2286: checking for Postgres DLZ driver" >&5 -+# Check whether --with-dlz_postgres or --without-dlz_postgres was given. -+if test "${with_dlz_postgres+set}" = set; then -+ withval="$with_dlz_postgres" -+ use_dlz_postgres="$withval" -+else -+ use_dlz_postgres="no" -+fi -+ -+ -+case "$use_dlz_postgres" in -+ no) -+ echo "$ac_t""no" 1>&6 -+ ;; -+ *) -+ #set use_dlz = "yes" so the DLZ core will be built -+ use_dlz=yes -+ if test "$use_dlz_postgres" = "yes" -+ then -+ # User did not specify a path - guess it -+ pgdirs="/usr /usr/local /usr/local/pgsql /usr/pkg" -+ for d in $pgdirs -+ do -+ if test -f $d/include/libpq-fe.h -+ then -+ use_dlz_postgres=$d -+ break -+ fi -+ done -+ if test "$use_dlz_postgres" = "yes" -+ then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: PostgreSQL was not found in any of $pgdirs; use --with-dlz-postgres=/path" 1>&2; exit 1; } -+ fi -+ fi -+ USE_DLZ_POSTGRES='-DDLZ_POSTGRES' -+ DLZ_POSTGRES_INC="-I$use_dlz_postgres/include" -+ DLZ_POSTGRES_LIBS="-L$use_dlz_postgres/lib -lpq" -+ echo "$ac_t""using PostgreSQL from $use_dlz_postgres/lib and $use_dlz_postgres/include" 1>&6 -+ ;; -+esac -+ -+ -+ -+ -+ -+ -+ -+# -+# was --with-dlz-mysql specified? -+# -+ -+echo $ac_n "checking for MySQL DLZ driver""... $ac_c" 1>&6 -+echo "configure:2339: checking for MySQL DLZ driver" >&5 -+# Check whether --with-dlz_mysql or --without-dlz_mysql was given. -+if test "${with_dlz_mysql+set}" = set; then -+ withval="$with_dlz_mysql" -+ use_dlz_mysql="$withval" -+else -+ use_dlz_mysql="no" -+fi -+ -+ -+case "$use_dlz_mysql" in -+ no) -+ echo "$ac_t""no" 1>&6 -+ ;; -+ *) -+ #set use_dlz = "yes" so the DLZ core will be built -+ use_dlz=yes -+ if test "$use_dlz_mysql" = "yes" -+ then -+ # User did not specify a path - guess it -+ mysqldirs="/usr /usr/local /usr/local/mysql /usr/pkg" -+ for d in $mysqldirs -+ do -+ if test -f $d/include/mysql/mysql.h -+ then -+ use_dlz_mysql=$d -+ break -+ fi -+ done -+ if test "$use_dlz_mysql" = "yes" -+ then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: MySQL was not found in any of $mysqldirs; use --with-dlz-mysql=/path" 1>&2; exit 1; } -+ fi -+ fi -+ USE_DLZ_MYSQL='-DDLZ_MYSQL' -+ DLZ_MYSQL_INC="-I$use_dlz_mysql/include/mysql" -+ DLZ_MYSQL_LIBS="-L$use_dlz_mysql/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm" -+ echo "$ac_t""using mysql from $use_dlz_mysql/lib/mysql and $use_dlz_mysql/include/mysql" 1>&6 -+ ;; -+esac -+ -+ -+ -+ -+ -+ -+# -+# was --with-dlz-bdb specified? -+# -+ -+echo $ac_n "checking for Berkeley DB DLZ driver""... $ac_c" 1>&6 -+echo "configure:2391: checking for Berkeley DB DLZ driver" >&5 -+# Check whether --with-dlz_bdb or --without-dlz_bdb was given. -+if test "${with_dlz_bdb+set}" = set; then -+ withval="$with_dlz_bdb" -+ use_dlz_bdb="$withval" -+else -+ use_dlz_bdb="no" -+fi -+ -+ -+case "$use_dlz_bdb" in -+ no) -+ echo "$ac_t""no" 1>&6 -+ ;; -+ *) -+ #set use_dlz = "yes" so the DLZ core will be built -+ use_dlz=yes -+ if test "$use_dlz_bdb" = "yes" -+ then -+ # User did not specify a path - guess it -+ bdbdirs="/usr /usr/local /usr/pkg" -+ for d in $bdbdirs -+ do -+ if test -f $d/include/db.h -+ then -+ use_dlz_bdb=$d -+ break -+ fi -+ done -+ if test "$use_dlz_bdb" = "yes" -+ then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: Berkeley DB was not found in any of $bdbdirs; use --with-dlz-bdb=/path" 1>&2; exit 1; } -+ fi -+ fi -+ -+ USE_DLZ_BDB='-DDLZ_BDB' -+ DLZ_BDB_INC="-I$use_dlz_bdb/include" -+ DLZ_BDB_LIBS="-L$use_dlz_bdb/lib -ldb" -+ echo "$ac_t""using Berkeley DB from $use_dlz_bdb/lib and $use_dlz_bdb/include" 1>&6 -+ ;; -+esac -+ -+ -+ -+ -+ -+ -+# -+# was --with-dlz-filesystem specified? -+# -+ -+echo $ac_n "checking for file system DLZ driver""... $ac_c" 1>&6 -+echo "configure:2444: checking for file system DLZ driver" >&5 -+# Check whether --with-dlz_filesystem or --without-dlz_filesystem was given. -+if test "${with_dlz_filesystem+set}" = set; then -+ withval="$with_dlz_filesystem" -+ use_dlz_filesystem="$withval" -+else -+ use_dlz_filesystem="no" -+fi -+ -+ -+case "$use_dlz_filesystem" in -+ no) -+ echo "$ac_t""no" 1>&6 -+ ;; -+ *) -+ #set use_dlz = "yes" so the DLZ core will be built -+ use_dlz=yes -+ USE_DLZ_FILESYSTEM='-DDLZ_FILESYSTEM' -+ echo "$ac_t""yes" 1>&6 -+ ;; -+esac -+ -+ -+ -+ -+# -+# was --with-dlz-stub specified? -+# -+ -+echo $ac_n "checking for stub DLZ driver""... $ac_c" 1>&6 -+echo "configure:2474: checking for stub DLZ driver" >&5 -+# Check whether --with-dlz_stub or --without-dlz_stub was given. -+if test "${with_dlz_stub+set}" = set; then -+ withval="$with_dlz_stub" -+ use_dlz_stub="$withval" -+else -+ use_dlz_stub="no" -+fi -+ -+ -+case "$use_dlz_stub" in -+ no) -+ echo "$ac_t""no" 1>&6 -+ ;; -+ *) -+ #set use_dlz = "yes" so the DLZ core will be built -+ use_dlz=yes -+ USE_DLZ_STUB='-DDLZ_STUB' -+ echo "$ac_t""yes" 1>&6 -+ ;; -+esac -+ -+ -+ -+ -+# -+# If any DLZ driver is built, the DLZ core is built too. -+# -+ -+echo $ac_n "checking for DLZ""... $ac_c" 1>&6 -+echo "configure:2504: checking for DLZ" >&5 -+ -+# check if any DLZ driver was built -+if test "$use_dlz" = "yes" -+then -+ echo "$ac_t""yes" 1>&6 -+ USE_DLZ="-DDLZ" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ -+ -+ -+# - # was --with-openssl specified? - # - echo $ac_n "checking for OpenSSL library""... $ac_c" 1>&6 --echo "configure:2261: checking for OpenSSL library" >&5 -+echo "configure:2522: checking for OpenSSL library" >&5 - # Check whether --with-openssl or --without-openssl was given. - if test "${with_openssl+set}" = set; then - withval="$with_openssl" -@@@@ -2298,7 +2559,7 @@@@ - echo "$ac_t""using openssl from $use_openssl/lib and $use_openssl/include" 1>&6 - - echo $ac_n "checking OpenSSL library version""... $ac_c" 1>&6 --echo "configure:2302: checking OpenSSL library version" >&5 -+echo "configure:2563: checking OpenSSL library version" >&5 - saved_cflags="$CFLAGS" - saved_libs="$LIBS" - CFLAGS="$CFLAGS $DST_OPENSSL_INC" -@@@@ -2307,7 +2568,7 @@@@ - echo "$ac_t""assuming target platform has compatible version" 1>&6 - else - cat > conftest.$ac_ext < -@@@@ -2322,7 +2583,7 @@@@ - } - - EOF --if { (eval echo configure:2326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - echo "$ac_t""ok" 1>&6 - else -@@@@ -2387,7 +2648,7 @@@@ - # was --with-randomdev specified? - # - echo $ac_n "checking for random device""... $ac_c" 1>&6 --echo "configure:2391: checking for random device" >&5 -+echo "configure:2652: checking for random device" >&5 - # Check whether --with-randomdev or --without-randomdev was given. - if test "${with_randomdev+set}" = set; then - withval="$with_randomdev" -@@@@ -2411,7 +2672,7 @@@@ - - ac_safe=`echo "$devrandom" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $devrandom""... $ac_c" 1>&6 --echo "configure:2415: checking for $devrandom" >&5 -+echo "configure:2676: checking for $devrandom" >&5 - if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -2463,7 +2724,7 @@@@ - # - - echo $ac_n "checking whether to build with thread support""... $ac_c" 1>&6 --echo "configure:2467: checking whether to build with thread support" >&5 -+echo "configure:2728: checking whether to build with thread support" >&5 - - case $host in - *-dec-osf*) -@@@@ -2551,7 +2812,7 @@@@ - # experiment with it. - CC="gcc" - echo $ac_n "checking which NetBSD thread library to use""... $ac_c" 1>&6 --echo "configure:2555: checking which NetBSD thread library to use" >&5 -+echo "configure:2816: checking which NetBSD thread library to use" >&5 - - # Check whether --with-ptl2 or --without-ptl2 was given. - if test "${with_ptl2+set}" = set; then -@@@@ -2590,7 +2851,7 @@@@ - ;; - *) - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:2594: checking for pthread_create in -lpthread" >&5 -+echo "configure:2855: checking for pthread_create in -lpthread" >&5 - ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -2598,7 +2859,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lpthread $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -2635,7 +2896,7 @@@@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:2639: checking for __pthread_create in -lpthread" >&5 -+echo "configure:2900: checking for __pthread_create in -lpthread" >&5 - ac_lib_var=`echo pthread'_'__pthread_create | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -2643,7 +2904,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lpthread $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -2680,7 +2941,7 @@@@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __pthread_create_system in -lpthread""... $ac_c" 1>&6 --echo "configure:2684: checking for __pthread_create_system in -lpthread" >&5 -+echo "configure:2945: checking for __pthread_create_system in -lpthread" >&5 - ac_lib_var=`echo pthread'_'__pthread_create_system | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -2688,7 +2949,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lpthread $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -2725,7 +2986,7 @@@@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:2729: checking for pthread_create in -lc_r" >&5 -+echo "configure:2990: checking for pthread_create in -lc_r" >&5 - ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -2733,7 +2994,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lc_r $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -2770,7 +3031,7 @@@@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 --echo "configure:2774: checking for pthread_create in -lc" >&5 -+echo "configure:3035: checking for pthread_create in -lc" >&5 - ac_lib_var=`echo c'_'pthread_create | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -2778,7 +3039,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lc $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -2835,7 +3096,7 @@@@ - # We'd like to use sigwait() too - # - echo $ac_n "checking for sigwait in -lc""... $ac_c" 1>&6 --echo "configure:2839: checking for sigwait in -lc" >&5 -+echo "configure:3100: checking for sigwait in -lc" >&5 - ac_lib_var=`echo c'_'sigwait | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -2843,7 +3104,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lc $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -2876,7 +3137,7 @@@@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for sigwait in -lpthread""... $ac_c" 1>&6 --echo "configure:2880: checking for sigwait in -lpthread" >&5 -+echo "configure:3141: checking for sigwait in -lpthread" >&5 - ac_lib_var=`echo pthread'_'sigwait | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -2884,7 +3145,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lpthread $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -2917,7 +3178,7 @@@@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for _Psigwait in -lpthread""... $ac_c" 1>&6 --echo "configure:2921: checking for _Psigwait in -lpthread" >&5 -+echo "configure:3182: checking for _Psigwait in -lpthread" >&5 - ac_lib_var=`echo pthread'_'_Psigwait | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -2925,7 +3186,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lpthread $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -2966,12 +3227,12 @@@@ - - - echo $ac_n "checking for pthread_attr_getstacksize""... $ac_c" 1>&6 --echo "configure:2970: checking for pthread_attr_getstacksize" >&5 -+echo "configure:3231: checking for pthread_attr_getstacksize" >&5 - if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_getstacksize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_pthread_attr_getstacksize=yes" - else -@@@@ -3026,7 +3287,7 @@@@ - # - *-freebsd*) - echo $ac_n "checking for sigwait in -lc_r""... $ac_c" 1>&6 --echo "configure:3030: checking for sigwait in -lc_r" >&5 -+echo "configure:3291: checking for sigwait in -lc_r" >&5 - ac_lib_var=`echo c_r'_'sigwait | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -3034,7 +3295,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lc_r $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -3100,12 +3361,12 @@@@ - EOF - - echo $ac_n "checking for pthread_setconcurrency""... $ac_c" 1>&6 --echo "configure:3104: checking for pthread_setconcurrency" >&5 -+echo "configure:3365: checking for pthread_setconcurrency" >&5 - if eval "test \"`echo '$''{'ac_cv_func_pthread_setconcurrency'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_pthread_setconcurrency=yes" - else -@@@@ -3166,12 +3427,12 @@@@ - # Look for sysconf to allow detection of the number of processors. - # - echo $ac_n "checking for sysconf""... $ac_c" 1>&6 --echo "configure:3170: checking for sysconf" >&5 -+echo "configure:3431: checking for sysconf" >&5 - if eval "test \"`echo '$''{'ac_cv_func_sysconf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_sysconf=yes" - else -@@@@ -3275,12 +3536,12 @@@@ - # be defined. - # - echo $ac_n "checking for flockfile""... $ac_c" 1>&6 --echo "configure:3279: checking for flockfile" >&5 -+echo "configure:3540: checking for flockfile" >&5 - if eval "test \"`echo '$''{'ac_cv_func_flockfile'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_flockfile=yes" - else -@@@@ -3326,12 +3587,12 @@@@ - fi - - echo $ac_n "checking for getc_unlocked""... $ac_c" 1>&6 --echo "configure:3330: checking for getc_unlocked" >&5 -+echo "configure:3591: checking for getc_unlocked" >&5 - if eval "test \"`echo '$''{'ac_cv_func_getc_unlocked'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_getc_unlocked=yes" - else -@@@@ -3381,7 +3642,7 @@@@ - # Indicate what the final decision was regarding threads. - # - echo $ac_n "checking whether to build with threads""... $ac_c" 1>&6 --echo "configure:3385: checking whether to build with threads" >&5 -+echo "configure:3646: checking whether to build with threads" >&5 - if $use_threads; then - echo "$ac_t""yes" 1>&6 - else -@@@@ -3457,12 +3718,12 @@@@ - # NLS - # - echo $ac_n "checking for catgets""... $ac_c" 1>&6 --echo "configure:3461: checking for catgets" >&5 -+echo "configure:3722: checking for catgets" >&5 - if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_catgets=yes" - else -@@@@ -3523,7 +3784,7 @@@@ - ;; - *) - echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:3527: checking for socket in -lsocket" >&5 -+echo "configure:3788: checking for socket in -lsocket" >&5 - ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -3531,7 +3792,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -3570,7 +3831,7 @@@@ - fi - - echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6 --echo "configure:3574: checking for inet_ntoa in -lnsl" >&5 -+echo "configure:3835: checking for inet_ntoa in -lnsl" >&5 - ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -3578,7 +3839,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -3623,7 +3884,7 @@@@ - # Purify support - # - echo $ac_n "checking whether to use purify""... $ac_c" 1>&6 --echo "configure:3627: checking whether to use purify" >&5 -+echo "configure:3888: checking whether to use purify" >&5 - # Check whether --with-purify or --without-purify was given. - if test "${with_purify+set}" = set; then - withval="$with_purify" -@@@@ -3640,7 +3901,7 @@@@ - # Extract the first word of "purify", so it can be a program name with args. - set dummy purify; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3644: checking for $ac_word" >&5 -+echo "configure:3905: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_purify_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -3717,12 +3978,12 @@@@ - case $use_libtool in - yes) - echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 --echo "configure:3721: checking for Cygwin environment" >&5 -+echo "configure:3982: checking for Cygwin environment" >&5 - if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes - else -@@@@ -3750,19 +4011,19 @@@@ - CYGWIN= - test "$ac_cv_cygwin" = yes && CYGWIN=yes - echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 --echo "configure:3754: checking for mingw32 environment" >&5 -+echo "configure:4015: checking for mingw32 environment" >&5 - if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes - else -@@@@ -3848,7 +4109,7 @@@@ - fi - - echo $ac_n "checking build system type""... $ac_c" 1>&6 --echo "configure:3852: checking build system type" >&5 -+echo "configure:4113: checking build system type" >&5 - - build_alias=$build - case "$build_alias" in -@@@@ -3877,7 +4138,7 @@@@ - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 --echo "configure:3881: checking for ld used by GCC" >&5 -+echo "configure:4142: checking for ld used by GCC" >&5 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@@@ -3907,10 +4168,10 @@@@ - esac - elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 --echo "configure:3911: checking for GNU ld" >&5 -+echo "configure:4172: checking for GNU ld" >&5 - else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 --echo "configure:3914: checking for non-GNU ld" >&5 -+echo "configure:4175: checking for non-GNU ld" >&5 - fi - if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -3945,7 +4206,7 @@@@ - fi - test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } - echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 --echo "configure:3949: checking if the linker ($LD) is GNU ld" >&5 -+echo "configure:4210: checking if the linker ($LD) is GNU ld" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -3962,7 +4223,7 @@@@ - - - echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 --echo "configure:3966: checking for $LD option to reload object files" >&5 -+echo "configure:4227: checking for $LD option to reload object files" >&5 - if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -3974,7 +4235,7 @@@@ - test -n "$reload_flag" && reload_flag=" $reload_flag" - - echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 --echo "configure:3978: checking for BSD-compatible nm" >&5 -+echo "configure:4239: checking for BSD-compatible nm" >&5 - if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4012,7 +4273,7 @@@@ - echo "$ac_t""$NM" 1>&6 - - echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:4016: checking whether ln -s works" >&5 -+echo "configure:4277: checking whether ln -s works" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4033,7 +4294,7 @@@@ - fi - - echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 --echo "configure:4037: checking how to recognise dependant libraries" >&5 -+echo "configure:4298: checking how to recognise dependant libraries" >&5 - if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4206,13 +4467,13 @@@@ - deplibs_check_method=$lt_cv_deplibs_check_method - - echo $ac_n "checking for object suffix""... $ac_c" 1>&6 --echo "configure:4210: checking for object suffix" >&5 -+echo "configure:4471: checking for object suffix" >&5 - if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - rm -f conftest* - echo 'int i = 1;' > conftest.$ac_ext --if { (eval echo configure:4216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - for ac_file in conftest.*; do - case $ac_file in - *.c) ;; -@@@@ -4232,7 +4493,7 @@@@ - - - echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 --echo "configure:4236: checking for executable suffix" >&5 -+echo "configure:4497: checking for executable suffix" >&5 - if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4242,7 +4503,7 @@@@ - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= -- if { (eval echo configure:4246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+ if { (eval echo configure:4507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.c | *.o | *.obj) ;; -@@@@ -4273,7 +4534,7 @@@@ - - # Check for command to grab the raw symbol name followed by C symbol from nm. - echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 --echo "configure:4277: checking command to parse $NM output" >&5 -+echo "configure:4538: checking command to parse $NM output" >&5 - if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4349,10 +4610,10 @@@@ - int main(){nm_test_var='a';nm_test_func();return(0);} - EOF - -- if { (eval echo configure:4353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:4614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - # Now try to grab the symbols. - nlist=conftest.nm -- if { (eval echo configure:4356: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then -+ if { (eval echo configure:4617: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" -@@@@ -4403,7 +4664,7 @@@@ - save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$no_builtin_flag" -- if { (eval echo configure:4407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+ if { (eval echo configure:4668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - pipe_works=yes - fi - LIBS="$save_LIBS" -@@@@ -4449,17 +4710,17 @@@@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4453: checking for $ac_hdr" >&5 -+echo "configure:4714: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@@@ -4494,7 +4755,7 @@@@ - file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 --echo "configure:4498: checking for ${ac_tool_prefix}file" >&5 -+echo "configure:4759: checking for ${ac_tool_prefix}file" >&5 - if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4556,7 +4817,7 @@@@ - if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - echo $ac_n "checking for file""... $ac_c" 1>&6 --echo "configure:4560: checking for file" >&5 -+echo "configure:4821: checking for file" >&5 - if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4627,7 +4888,7 @@@@ - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4631: checking for $ac_word" >&5 -+echo "configure:4892: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4659,7 +4920,7 @@@@ - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4663: checking for $ac_word" >&5 -+echo "configure:4924: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4694,7 +4955,7 @@@@ - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4698: checking for $ac_word" >&5 -+echo "configure:4959: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4726,7 +4987,7 @@@@ - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4730: checking for $ac_word" >&5 -+echo "configure:4991: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4775,8 +5036,8 @@@@ - case $host in - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 4779 "configure"' > conftest.$ac_ext -- if { (eval echo configure:4780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ echo '#line 5040 "configure"' > conftest.$ac_ext -+ if { (eval echo configure:5041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" -@@@@ -4797,7 +5058,7 @@@@ - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 --echo "configure:4801: checking whether the C compiler needs -belf" >&5 -+echo "configure:5062: checking whether the C compiler needs -belf" >&5 - if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -4810,14 +5071,14 @@@@ - cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_cc_needs_belf=yes - else -@@@@ -4932,7 +5193,7 @@@@ - ## FIXME: this should be a separate macro - ## - echo $ac_n "checking for objdir""... $ac_c" 1>&6 --echo "configure:4936: checking for objdir" >&5 -+echo "configure:5197: checking for objdir" >&5 - rm -f .libs 2>/dev/null - mkdir .libs 2>/dev/null - if test -d .libs; then -@@@@ -4963,7 +5224,7 @@@@ - # in isolation, and that seeing it set (from the cache) indicates that - # the associated values are set (in the cache) correctly too. - echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 --echo "configure:4967: checking for $compiler option to produce PIC" >&5 -+echo "configure:5228: checking for $compiler option to produce PIC" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -5115,21 +5376,21 @@@@ - - # Check to make sure the pic_flag actually works. - echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6 --echo "configure:5119: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 -+echo "configure:5380: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - case $host_os in - hpux9* | hpux10* | hpux11*) -@@@@ -5185,7 +5446,7 @@@@ - ## FIXME: this should be a separate macro - ## - echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6 --echo "configure:5189: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 -+echo "configure:5450: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -5193,14 +5454,14 @@@@ - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_prog_cc_static_works=yes - else -@@@@ -5231,7 +5492,7 @@@@ - ## - # Check to see if options -o and -c are simultaneously supported by compiler - echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 --echo "configure:5235: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo "configure:5496: checking if $compiler supports -c -o file.$ac_objext" >&5 - if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -5250,7 +5511,7 @@@@ - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" - compiler_c_o=no --if { (eval echo configure:5254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then -+if { (eval echo configure:5515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s out/conftest.err; then -@@@@ -5279,7 +5540,7 @@@@ - if test x"$compiler_c_o" = x"yes"; then - # Check to see if we can write to a .lo - echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6 --echo "configure:5283: checking if $compiler supports -c -o file.lo" >&5 -+echo "configure:5544: checking if $compiler supports -c -o file.lo" >&5 - if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -5288,14 +5549,14 @@@@ - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -c -o conftest.lo" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -@@@@ -5329,7 +5590,7 @@@@ - if test "$compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 --echo "configure:5333: checking if we can lock with hard links" >&5 -+echo "configure:5594: checking if we can lock with hard links" >&5 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no -@@@@ -5352,20 +5613,20 @@@@ - if test "$GCC" = yes; then - # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 --echo "configure:5356: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo "configure:5617: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 - echo "int some_variable = 0;" > conftest.$ac_ext - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" - compiler_rtti_exceptions=no - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -@@@@ -5396,7 +5657,7 @@@@ - ## - # See if the linker supports building shared libraries. - echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6 --echo "configure:5400: checking whether the linker ($LD) supports shared libraries" >&5 -+echo "configure:5661: checking whether the linker ($LD) supports shared libraries" >&5 - - allow_undefined_flag= - no_undefined_flag= -@@@@ -6016,7 +6277,7 @@@@ - ## - # Check hardcoding attributes. - echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 --echo "configure:6020: checking how to hardcode library paths into programs" >&5 -+echo "configure:6281: checking how to hardcode library paths into programs" >&5 - hardcode_action= - if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var"; then -@@@@ -6048,7 +6309,7 @@@@ - striplib= - old_striplib= - echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 --echo "configure:6052: checking whether stripping libraries is possible" >&5 -+echo "configure:6313: checking whether stripping libraries is possible" >&5 - if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" -@@@@ -6066,7 +6327,7 @@@@ - ## - # PORTME Fill in your ld.so characteristics - echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 --echo "configure:6070: checking dynamic linker characteristics" >&5 -+echo "configure:6331: checking dynamic linker characteristics" >&5 - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@@@ -6456,7 +6717,7 @@@@ - ## - # Report the final consequences. - echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 --echo "configure:6460: checking if libtool supports shared libraries" >&5 -+echo "configure:6721: checking if libtool supports shared libraries" >&5 - echo "$ac_t""$can_build_shared" 1>&6 - ## - ## END FIXME -@@@@ -6497,7 +6758,7 @@@@ - - *) - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:6501: checking for dlopen in -ldl" >&5 -+echo "configure:6762: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -6505,7 +6766,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -6535,12 +6796,12 @@@@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen""... $ac_c" 1>&6 --echo "configure:6539: checking for dlopen" >&5 -+echo "configure:6800: checking for dlopen" >&5 - if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" - else -@@@@ -6581,12 +6842,12 @@@@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for shl_load""... $ac_c" 1>&6 --echo "configure:6585: checking for shl_load" >&5 -+echo "configure:6846: checking for shl_load" >&5 - if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shl_load=yes" - else -@@@@ -6627,7 +6888,7 @@@@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 --echo "configure:6631: checking for dlopen in -lsvld" >&5 -+echo "configure:6892: checking for dlopen in -lsvld" >&5 - ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -6635,7 +6896,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-lsvld $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -6665,7 +6926,7 @@@@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 --echo "configure:6669: checking for shl_load in -ldld" >&5 -+echo "configure:6930: checking for shl_load in -ldld" >&5 - ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@@@ -6673,7 +6934,7 @@@@ - ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@@@ -6737,7 +6998,7 @@@@ - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 --echo "configure:6741: checking whether a program can dlopen itself" >&5 -+echo "configure:7002: checking whether a program can dlopen itself" >&5 - if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -6747,7 +7008,7 @@@@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:7073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in -@@@@ -6831,7 +7092,7 @@@@ - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 --echo "configure:6835: checking whether a statically linked program can dlopen itself" >&5 -+echo "configure:7096: checking whether a statically linked program can dlopen itself" >&5 - if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -6841,7 +7102,7 @@@@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:7167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in -@@@@ -6953,14 +7214,14 @@@@ - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 --echo "configure:6957: checking whether -lc should be explicitly linked in" >&5 -+echo "configure:7218: checking whether -lc should be explicitly linked in" >&5 - if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - $rm conftest* - echo 'static int dummy;' > conftest.$ac_ext - -- if { (eval echo configure:6964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:7225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext -@@@@ -6973,7 +7234,7 @@@@ - libname=conftest - save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= -- if { (eval echo configure:6977: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } -+ if { (eval echo configure:7238: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } - then - lt_cv_archive_cmds_need_lc=no - else -@@@@ -7630,9 +7891,9 @@@@ - # the right suffix on the files. - # - echo $ac_n "checking for IPv6 structures""... $ac_c" 1>&6 --echo "configure:7634: checking for IPv6 structures" >&5 -+echo "configure:7895: checking for IPv6 structures" >&5 - cat > conftest.$ac_ext < -@@@@ -7642,7 +7903,7 @@@@ - struct sockaddr_in6 sin6; return (0); - ; return 0; } - EOF --if { (eval echo configure:7646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - found_ipv6=yes -@@@@ -7660,7 +7921,7 @@@@ - # This is done before other IPv6 linking tests to LIBS is properly set. - # - echo $ac_n "checking for Kame IPv6 support""... $ac_c" 1>&6 --echo "configure:7664: checking for Kame IPv6 support" >&5 -+echo "configure:7925: checking for Kame IPv6 support" >&5 - # Check whether --with-kame or --without-kame was given. - if test "${with_kame+set}" = set; then - withval="$with_kame" -@@@@ -7751,9 +8012,9 @@@@ - LWRES_PLATFORM_HAVEIPV6="#define LWRES_PLATFORM_HAVEIPV6 1" - - echo $ac_n "checking for in6_addr""... $ac_c" 1>&6 --echo "configure:7755: checking for in6_addr" >&5 -+echo "configure:8016: checking for in6_addr" >&5 - cat > conftest.$ac_ext < -@@@@ -7766,7 +8027,7 @@@@ - struct in6_addr in6; return (0); - ; return 0; } - EOF --if { (eval echo configure:7770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_HAVEINADDR6="#undef ISC_PLATFORM_HAVEINADDR6" -@@@@ -7784,9 +8045,9 @@@@ - rm -f conftest* - - echo $ac_n "checking for in6addr_any""... $ac_c" 1>&6 --echo "configure:7788: checking for in6addr_any" >&5 -+echo "configure:8049: checking for in6addr_any" >&5 - cat > conftest.$ac_ext < -@@@@ -7800,7 +8061,7 @@@@ - struct in6_addr in6; in6 = in6addr_any; return (in6.s6_addr[0]); - ; return 0; } - EOF --if { (eval echo configure:7804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_NEEDIN6ADDRANY="#undef ISC_PLATFORM_NEEDIN6ADDRANY" -@@@@ -7816,9 +8077,9 @@@@ - rm -f conftest* - - echo $ac_n "checking for in6addr_loopback""... $ac_c" 1>&6 --echo "configure:7820: checking for in6addr_loopback" >&5 -+echo "configure:8081: checking for in6addr_loopback" >&5 - cat > conftest.$ac_ext < -@@@@ -7832,7 +8093,7 @@@@ - struct in6_addr in6; in6 = in6addr_loopback; return (in6.s6_addr[0]); - ; return 0; } - EOF --if { (eval echo configure:7836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_NEEDIN6ADDRLOOPBACK="#undef ISC_PLATFORM_NEEDIN6ADDRLOOPBACK" -@@@@ -7848,9 +8109,9 @@@@ - rm -f conftest* - - echo $ac_n "checking for sin6_scope_id in struct sockaddr_in6""... $ac_c" 1>&6 --echo "configure:7852: checking for sin6_scope_id in struct sockaddr_in6" >&5 -+echo "configure:8113: checking for sin6_scope_id in struct sockaddr_in6" >&5 - cat > conftest.$ac_ext < -@@@@ -7863,7 +8124,7 @@@@ - struct sockaddr_in6 xyzzy; xyzzy.sin6_scope_id = 0; return (0); - ; return 0; } - EOF --if { (eval echo configure:7867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - result="#define LWRES_HAVE_SIN6_SCOPE_ID 1" -@@@@ -7878,9 +8139,9 @@@@ - LWRES_HAVE_SIN6_SCOPE_ID="$result" - - echo $ac_n "checking for in6_pktinfo""... $ac_c" 1>&6 --echo "configure:7882: checking for in6_pktinfo" >&5 -+echo "configure:8143: checking for in6_pktinfo" >&5 - cat > conftest.$ac_ext < -@@@@ -7893,7 +8154,7 @@@@ - struct in6_pktinfo xyzzy; return (0); - ; return 0; } - EOF --if { (eval echo configure:7897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_HAVEIN6PKTINFO="#define ISC_PLATFORM_HAVEIN6PKTINFO 1" -@@@@ -7948,9 +8209,9 @@@@ - # - - echo $ac_n "checking for inet_ntop""... $ac_c" 1>&6 --echo "configure:7952: checking for inet_ntop" >&5 -+echo "configure:8213: checking for inet_ntop" >&5 - cat > conftest.$ac_ext < -@@@@ -7960,7 +8221,7 @@@@ - inet_ntop(0, 0, 0, 0); return (0); - ; return 0; } - EOF --if { (eval echo configure:7964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP" -@@@@ -7981,13 +8242,13 @@@@ - # zeros should also be rejected. - - echo $ac_n "checking for inet_pton""... $ac_c" 1>&6 --echo "configure:7985: checking for inet_pton" >&5 -+echo "configure:8246: checking for inet_pton" >&5 - if test "$cross_compiling" = yes; then - echo "$ac_t""assuming target platform has working inet_pton" 1>&6 - ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON" - else - cat > conftest.$ac_ext < -@@@@ -7997,7 +8258,7 @@@@ - main() { char a[4]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : - inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 : 0); } - EOF --if { (eval echo configure:8001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON" -@@@@ -8015,9 +8276,9 @@@@ - - - echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 --echo "configure:8019: checking for inet_aton" >&5 -+echo "configure:8280: checking for inet_aton" >&5 - cat > conftest.$ac_ext < -@@@@ -8027,7 +8288,7 @@@@ - struct in_addr in; inet_aton(0, &in); return (0); - ; return 0; } - EOF --if { (eval echo configure:8031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_NEEDATON="#undef ISC_PLATFORM_NEEDATON" -@@@@ -8060,9 +8321,9 @@@@ - esac - - echo $ac_n "checking for sa_len in struct sockaddr""... $ac_c" 1>&6 --echo "configure:8064: checking for sa_len in struct sockaddr" >&5 -+echo "configure:8325: checking for sa_len in struct sockaddr" >&5 - cat > conftest.$ac_ext < -@@@@ -8071,7 +8332,7 @@@@ - struct sockaddr sa; sa.sa_len = 0; return (0); - ; return 0; } - EOF --if { (eval echo configure:8075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_HAVESALEN="#define ISC_PLATFORM_HAVESALEN 1" -@@@@ -8092,9 +8353,9 @@@@ - # Look for a 4.4BSD or 4.3BSD struct msghdr - # - echo $ac_n "checking for struct msghdr flavor""... $ac_c" 1>&6 --echo "configure:8096: checking for struct msghdr flavor" >&5 -+echo "configure:8357: checking for struct msghdr flavor" >&5 - cat > conftest.$ac_ext < -@@@@ -8103,7 +8364,7 @@@@ - struct msghdr msg; msg.msg_flags = 0; return (0); - ; return 0; } - EOF --if { (eval echo configure:8107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""4.4BSD" 1>&6 - ISC_PLATFORM_MSGHDRFLAVOR="#define ISC_NET_BSD44MSGHDR 1" -@@@@ -8121,9 +8382,9 @@@@ - # Look for in_port_t. - # - echo $ac_n "checking for type in_port_t""... $ac_c" 1>&6 --echo "configure:8125: checking for type in_port_t" >&5 -+echo "configure:8386: checking for type in_port_t" >&5 - cat > conftest.$ac_ext < -@@@@ -8132,7 +8393,7 @@@@ - in_port_t port = 25; return (0); - ; return 0; } - EOF --if { (eval echo configure:8136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_NEEDPORTT="#undef ISC_PLATFORM_NEEDPORTT" -@@@@ -8150,9 +8411,9 @@@@ - # Check for addrinfo - # - echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6 --echo "configure:8154: checking for struct addrinfo" >&5 -+echo "configure:8415: checking for struct addrinfo" >&5 - cat > conftest.$ac_ext < -@@@@ -8160,7 +8421,7 @@@@ - struct addrinfo a; return (0); - ; return 0; } - EOF --if { (eval echo configure:8164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_LWRES_NEEDADDRINFO="#undef ISC_LWRES_NEEDADDRINFO" -@@@@ -8182,9 +8443,9 @@@@ - # Check for rrsetinfo - # - echo $ac_n "checking for struct rrsetinfo""... $ac_c" 1>&6 --echo "configure:8186: checking for struct rrsetinfo" >&5 -+echo "configure:8447: checking for struct rrsetinfo" >&5 - cat > conftest.$ac_ext < -@@@@ -8192,7 +8453,7 @@@@ - struct rrsetinfo r; return (0); - ; return 0; } - EOF --if { (eval echo configure:8196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_LWRES_NEEDRRSETINFO="#undef ISC_LWRES_NEEDRRSETINFO" -@@@@ -8207,9 +8468,9 @@@@ - - - echo $ac_n "checking for int sethostent""... $ac_c" 1>&6 --echo "configure:8211: checking for int sethostent" >&5 -+echo "configure:8472: checking for int sethostent" >&5 - cat > conftest.$ac_ext < -@@@@ -8217,7 +8478,7 @@@@ - int i = sethostent(0); return(0); - ; return 0; } - EOF --if { (eval echo configure:8221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_LWRES_SETHOSTENTINT="#define ISC_LWRES_SETHOSTENTINT 1" -@@@@ -8232,9 +8493,9 @@@@ - - - echo $ac_n "checking for int endhostent""... $ac_c" 1>&6 --echo "configure:8236: checking for int endhostent" >&5 -+echo "configure:8497: checking for int endhostent" >&5 - cat > conftest.$ac_ext < -@@@@ -8242,7 +8503,7 @@@@ - int i = endhostent(); return(0); - ; return 0; } - EOF --if { (eval echo configure:8246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_LWRES_ENDHOSTENTINT="#define ISC_LWRES_ENDHOSTENTINT 1" -@@@@ -8257,9 +8518,9 @@@@ - - - echo $ac_n "checking for getnetbyaddr(in_addr_t, ...)""... $ac_c" 1>&6 --echo "configure:8261: checking for getnetbyaddr(in_addr_t, ...)" >&5 -+echo "configure:8522: checking for getnetbyaddr(in_addr_t, ...)" >&5 - cat > conftest.$ac_ext < -@@@@ -8268,7 +8529,7 @@@@ - - ; return 0; } - EOF --if { (eval echo configure:8272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_LWRES_GETNETBYADDRINADDR="#define ISC_LWRES_GETNETBYADDRINADDR 1" -@@@@ -8283,9 +8544,9 @@@@ - - - echo $ac_n "checking for int setnetent""... $ac_c" 1>&6 --echo "configure:8287: checking for int setnetent" >&5 -+echo "configure:8548: checking for int setnetent" >&5 - cat > conftest.$ac_ext < -@@@@ -8293,7 +8554,7 @@@@ - int i = setnetent(0); return(0); - ; return 0; } - EOF --if { (eval echo configure:8297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_LWRES_SETNETENTINT="#define ISC_LWRES_SETNETENTINT 1" -@@@@ -8308,9 +8569,9 @@@@ - - - echo $ac_n "checking for int endnetent""... $ac_c" 1>&6 --echo "configure:8312: checking for int endnetent" >&5 -+echo "configure:8573: checking for int endnetent" >&5 - cat > conftest.$ac_ext < -@@@@ -8318,7 +8579,7 @@@@ - int i = endnetent(); return(0); - ; return 0; } - EOF --if { (eval echo configure:8322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_LWRES_ENDNETENTINT="#define ISC_LWRES_ENDNETENTINT 1" -@@@@ -8333,9 +8594,9 @@@@ - - - echo $ac_n "checking for gethostbyaddr(const void *, size_t, ...)""... $ac_c" 1>&6 --echo "configure:8337: checking for gethostbyaddr(const void *, size_t, ...)" >&5 -+echo "configure:8598: checking for gethostbyaddr(const void *, size_t, ...)" >&5 - cat > conftest.$ac_ext < -@@@@ -8344,7 +8605,7 @@@@ - return(0); - ; return 0; } - EOF --if { (eval echo configure:8348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_LWRES_GETHOSTBYADDRVOID="#define ISC_LWRES_GETHOSTBYADDRVOID 1" -@@@@ -8359,9 +8620,9 @@@@ - - - echo $ac_n "checking for h_errno in netdb.h""... $ac_c" 1>&6 --echo "configure:8363: checking for h_errno in netdb.h" >&5 -+echo "configure:8624: checking for h_errno in netdb.h" >&5 - cat > conftest.$ac_ext < -@@@@ -8369,7 +8630,7 @@@@ - h_errno = 1; return(0); - ; return 0; } - EOF --if { (eval echo configure:8373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_LWRES_NEEDHERRNO="#undef ISC_LWRES_NEEDHERRNO" -@@@@ -8384,12 +8645,12 @@@@ - - - echo $ac_n "checking for getipnodebyname""... $ac_c" 1>&6 --echo "configure:8388: checking for getipnodebyname" >&5 -+echo "configure:8649: checking for getipnodebyname" >&5 - if eval "test \"`echo '$''{'ac_cv_func_getipnodebyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_getipnodebyname=yes" - else -@@@@ -8433,12 +8694,12 @@@@ - fi - - echo $ac_n "checking for getnameinfo""... $ac_c" 1>&6 --echo "configure:8437: checking for getnameinfo" >&5 -+echo "configure:8698: checking for getnameinfo" >&5 - if eval "test \"`echo '$''{'ac_cv_func_getnameinfo'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_getnameinfo=yes" - else -@@@@ -8482,12 +8743,12 @@@@ - fi - - echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 --echo "configure:8486: checking for getaddrinfo" >&5 -+echo "configure:8747: checking for getaddrinfo" >&5 - if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_getaddrinfo=yes" - else -@@@@ -8535,12 +8796,12 @@@@ - fi - - echo $ac_n "checking for gai_strerror""... $ac_c" 1>&6 --echo "configure:8539: checking for gai_strerror" >&5 -+echo "configure:8800: checking for gai_strerror" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gai_strerror'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gai_strerror=yes" - else -@@@@ -8593,9 +8854,9 @@@@ - # Look for a sysctl call to get the list of network interfaces. - # - echo $ac_n "checking for interface list sysctl""... $ac_c" 1>&6 --echo "configure:8597: checking for interface list sysctl" >&5 -+echo "configure:8858: checking for interface list sysctl" >&5 - cat > conftest.$ac_ext < -@@@@ -8632,16 +8893,16 @@@@ - # AC_CHECK_FUNC() incorrectly succeeds because it declares - # the function itself. - echo $ac_n "checking for correctly declared strsep()""... $ac_c" 1>&6 --echo "configure:8636: checking for correctly declared strsep()" >&5 -+echo "configure:8897: checking for correctly declared strsep()" >&5 - cat > conftest.$ac_ext < - int main() { - char *sp; char *foo = strsep(&sp, "."); - ; return 0; } - EOF --if { (eval echo configure:8645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6; ISC_PLATFORM_NEEDSTRSEP="#undef ISC_PLATFORM_NEEDSTRSEP" - else -@@@@ -8653,12 +8914,12 @@@@ - rm -f conftest* - - echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 --echo "configure:8657: checking for vsnprintf" >&5 -+echo "configure:8918: checking for vsnprintf" >&5 - if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_vsnprintf=yes" - else -@@@@ -8706,12 +8967,12 @@@@ - - - echo $ac_n "checking for strerror""... $ac_c" 1>&6 --echo "configure:8710: checking for strerror" >&5 -+echo "configure:8971: checking for strerror" >&5 - if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_strerror=yes" - else -@@@@ -8768,17 +9029,17 @@@@ - # but that's defined elsewhere since we don't use configure on Win32. - # - echo $ac_n "checking printf format modifier for 64-bit integers""... $ac_c" 1>&6 --echo "configure:8772: checking printf format modifier for 64-bit integers" >&5 -+echo "configure:9033: checking printf format modifier for 64-bit integers" >&5 - if test "$cross_compiling" = yes; then - echo "$ac_t""assuming target platform uses ll" 1>&6 - ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"' - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - echo "$ac_t""l" 1>&6 - ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "l"' -@@@@ -8798,12 +9059,12 @@@@ - # Security Stuff - # - echo $ac_n "checking for chroot""... $ac_c" 1>&6 --echo "configure:8802: checking for chroot" >&5 -+echo "configure:9063: checking for chroot" >&5 - if eval "test \"`echo '$''{'ac_cv_func_chroot'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_chroot=yes" - else -@@@@ -8860,17 +9121,17 @@@@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8864: checking for $ac_hdr" >&5 -+echo "configure:9125: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@@@ -8904,17 +9165,17 @@@@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8908: checking for $ac_hdr" >&5 -+echo "configure:9169: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@@@ -8945,9 +9206,9 @@@@ - # BSD/OS, and perhaps some others, don't define rlim_t. - # - echo $ac_n "checking for type rlim_t""... $ac_c" 1>&6 --echo "configure:8949: checking for type rlim_t" >&5 -+echo "configure:9210: checking for type rlim_t" >&5 - cat > conftest.$ac_ext < -@@@@ -8957,7 +9218,7 @@@@ - rlim_t rl = 19671212; return (0); - ; return 0; } - EOF --if { (eval echo configure:8961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE rlim_t" -@@@@ -8968,12 +9229,12 @@@@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking type of rlim_cur""... $ac_c" 1>&6 --echo "configure:8972: checking type of rlim_cur" >&5 -+echo "configure:9233: checking type of rlim_cur" >&5 - if test "$cross_compiling" = yes; then - { echo "configure: error: cannot determine type of rlim_cur when cross compiling - define rlim_t" 1>&2; exit 1; } - else - cat > conftest.$ac_ext < -@@@@ -8981,7 +9242,7 @@@@ - #include - main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));} - EOF --if { (eval echo configure:8985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - echo "$ac_t""int" 1>&6 - ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE int" -@@@@ -8994,7 +9255,7 @@@@ - { echo "configure: error: this cannot happen" 1>&2; exit 1; } - else - cat > conftest.$ac_ext < -@@@@ -9002,7 +9263,7 @@@@ - #include - main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));} - EOF --if { (eval echo configure:9006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - echo "$ac_t""long int" 1>&6 - ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long int" -@@@@ -9015,7 +9276,7 @@@@ - { echo "configure: error: this cannot happen" 1>&2; exit 1; } - else - cat > conftest.$ac_ext < -@@@@ -9023,7 +9284,7 @@@@ - #include - main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));} - EOF --if { (eval echo configure:9027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - echo "$ac_t""long long int" 1>&6 - ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int" -@@@@ -9147,7 +9408,7 @@@@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:9151: checking for $ac_word" >&5 -+echo "configure:9412: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_OPENJADE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -9194,7 +9455,7 @@@@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:9198: checking for $ac_word" >&5 -+echo "configure:9459: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_JADETEX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -9237,7 +9498,7 @@@@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:9241: checking for $ac_word" >&5 -+echo "configure:9502: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PDFJADETEX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@@@ -9293,7 +9554,7 @@@@ - - SGMLCATALOG="" - echo $ac_n "checking for catalog""... $ac_c" 1>&6 --echo "configure:9297: checking for catalog" >&5 -+echo "configure:9558: checking for catalog" >&5 - for d in $sgmltrees - do - f=$d/catalog -@@@@ -9335,7 +9596,7 @@@@ - - HTMLSTYLE="" - echo $ac_n "checking for html/docbook.dsl""... $ac_c" 1>&6 --echo "configure:9339: checking for html/docbook.dsl" >&5 -+echo "configure:9600: checking for html/docbook.dsl" >&5 - for d in $stylepath - do - f=$d/html/docbook.dsl -@@@@ -9356,7 +9617,7 @@@@ - - PRINTSTYLE="" - echo $ac_n "checking for print/docbook.dsl""... $ac_c" 1>&6 --echo "configure:9360: checking for print/docbook.dsl" >&5 -+echo "configure:9621: checking for print/docbook.dsl" >&5 - for d in $stylepath - do - f=$d/print/docbook.dsl -@@@@ -9382,7 +9643,7 @@@@ - - XMLDCL="" - echo $ac_n "checking for docbook/dsssl/modular/dtds/decls/xml.dcl""... $ac_c" 1>&6 --echo "configure:9386: checking for docbook/dsssl/modular/dtds/decls/xml.dcl" >&5 -+echo "configure:9647: checking for docbook/dsssl/modular/dtds/decls/xml.dcl" >&5 - for d in $sgmltrees - do - f=$d/docbook/dsssl/modular/dtds/decls/xml.dcl -@@@@ -9408,7 +9669,7 @@@@ - - DOCBOOK2MANSPEC="" - echo $ac_n "checking for docbook2X/docbook2man-spec.pl""... $ac_c" 1>&6 --echo "configure:9412: checking for docbook2X/docbook2man-spec.pl" >&5 -+echo "configure:9673: checking for docbook2X/docbook2man-spec.pl" >&5 - for d in $sgmltrees - do - f=$d/docbook2X/docbook2man-spec.pl -@@@@ -9624,6 +9885,7 @@@@ - lib/tests/include/Makefile - lib/tests/include/tests/Makefile - bin/Makefile -+ bin/dlzbdb/Makefile - bin/check/Makefile - bin/named/Makefile - bin/named/unix/Makefile -@@@@ -9713,6 +9975,18 @@@@ - s%@@ISC_PLATFORM_HAVELONGLONG@@%$ISC_PLATFORM_HAVELONGLONG%g - s%@@ISC_PLATFORM_NEEDSYSSELECTH@@%$ISC_PLATFORM_NEEDSYSSELECTH%g - s%@@LWRES_PLATFORM_NEEDSYSSELECTH@@%$LWRES_PLATFORM_NEEDSYSSELECTH%g -+s%@@DLZ_POSTGRES_INC@@%$DLZ_POSTGRES_INC%g -+s%@@DLZ_POSTGRES_LIBS@@%$DLZ_POSTGRES_LIBS%g -+s%@@USE_DLZ_POSTGRES@@%$USE_DLZ_POSTGRES%g -+s%@@DLZ_MYSQL_INC@@%$DLZ_MYSQL_INC%g -+s%@@DLZ_MYSQL_LIBS@@%$DLZ_MYSQL_LIBS%g -+s%@@USE_DLZ_MYSQL@@%$USE_DLZ_MYSQL%g -+s%@@DLZ_BDB_INC@@%$DLZ_BDB_INC%g -+s%@@DLZ_BDB_LIBS@@%$DLZ_BDB_LIBS%g -+s%@@USE_DLZ_BDB@@%$USE_DLZ_BDB%g -+s%@@USE_DLZ_FILESYSTEM@@%$USE_DLZ_FILESYSTEM%g -+s%@@USE_DLZ_STUB@@%$USE_DLZ_STUB%g -+s%@@USE_DLZ@@%$USE_DLZ%g - s%@@DST_OPENSSL_INC@@%$DST_OPENSSL_INC%g - s%@@DNS_OPENSSL_LIBS@@%$DNS_OPENSSL_LIBS%g - s%@@USE_OPENSSL@@%$USE_OPENSSL%g -@@@@ -9828,7 +10102,7 @@@@ - - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. --ac_max_sed_cmds=50 # Maximum number of lines to put in a sed script. -+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. - ac_file=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_cmds # Line after last line for current file. -@@@@ -9907,6 +10181,7 @@@@ - lib/tests/include/Makefile - lib/tests/include/tests/Makefile - bin/Makefile -+ bin/dlzbdb/Makefile - bin/check/Makefile - bin/named/Makefile - bin/named/unix/Makefile -diff -Naur bind-9.2.1-orig/configure.in bind-9.2.1/configure.in ---- bind-9.2.1-orig/configure.in Tue Dec 4 20:28:36 2001 -+++ bind-9.2.1/configure.in Tue Apr 8 21:50:02 2003 -@@@@ -271,6 +271,232 @@@@ - AC_C_BIGENDIAN - - # -+# Build DLZ support? -+# -+# The use_dlz flag is set to no. If one of the DLZ drivers is selected -+# for build the use_dlz flag will be set to yes -+# -+ -+use_dlz=no -+ -+# -+# was --with-dlz-postgres specified? -+# -+ -+AC_MSG_CHECKING(for Postgres DLZ driver) -+AC_ARG_WITH(dlz_postgres, -+[ --with-dlz-postgres[=PATH] Build with Postgres DLZ driver [yes|no|path]. -+ (Required to use Postgres with DLZ)], -+ use_dlz_postgres="$withval", use_dlz_postgres="no") -+ -+case "$use_dlz_postgres" in -+ no) -+ AC_MSG_RESULT(no) -+ ;; -+ *) -+ #set use_dlz = "yes" so the DLZ core will be built -+ use_dlz=yes -+ if test "$use_dlz_postgres" = "yes" -+ then -+ # User did not specify a path - guess it -+ pgdirs="/usr /usr/local /usr/local/pgsql /usr/pkg" -+ for d in $pgdirs -+ do -+ if test -f $d/include/libpq-fe.h -+ then -+ use_dlz_postgres=$d -+ break -+ fi -+ done -+ if test "$use_dlz_postgres" = "yes" -+ then -+ AC_MSG_RESULT(not found) -+ AC_MSG_ERROR( -+[PostgreSQL was not found in any of $pgdirs; use --with-dlz-postgres=/path]) -+ fi -+ fi -+ USE_DLZ_POSTGRES='-DDLZ_POSTGRES' -+ DLZ_POSTGRES_INC="-I$use_dlz_postgres/include" -+ DLZ_POSTGRES_LIBS="-L$use_dlz_postgres/lib -lpq" -+ AC_MSG_RESULT( -+[using PostgreSQL from $use_dlz_postgres/lib and $use_dlz_postgres/include]) -+ ;; -+esac -+ -+ -+AC_SUBST(DLZ_POSTGRES_INC) -+AC_SUBST(DLZ_POSTGRES_LIBS) -+AC_SUBST(USE_DLZ_POSTGRES) -+ -+ -+# -+# was --with-dlz-mysql specified? -+# -+ -+AC_MSG_CHECKING(for MySQL DLZ driver) -+AC_ARG_WITH(dlz_mysql, -+[ --with-dlz-mysql[=PATH] Build with MySQL DLZ driver [yes|no|path]. -+ (Required to use MySQL with DLZ)], -+ use_dlz_mysql="$withval", use_dlz_mysql="no") -+ -+case "$use_dlz_mysql" in -+ no) -+ AC_MSG_RESULT(no) -+ ;; -+ *) -+ #set use_dlz = "yes" so the DLZ core will be built -+ use_dlz=yes -+ if test "$use_dlz_mysql" = "yes" -+ then -+ # User did not specify a path - guess it -+ mysqldirs="/usr /usr/local /usr/local/mysql /usr/pkg" -+ for d in $mysqldirs -+ do -+ if test -f $d/include/mysql/mysql.h -+ then -+ use_dlz_mysql=$d -+ break -+ fi -+ done -+ if test "$use_dlz_mysql" = "yes" -+ then -+ AC_MSG_RESULT(not found) -+ AC_MSG_ERROR( -+[MySQL was not found in any of $mysqldirs; use --with-dlz-mysql=/path]) -+ fi -+ fi -+ USE_DLZ_MYSQL='-DDLZ_MYSQL' -+ DLZ_MYSQL_INC="-I$use_dlz_mysql/include/mysql" -+ DLZ_MYSQL_LIBS="-L$use_dlz_mysql/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm" -+ AC_MSG_RESULT( -+[using mysql from $use_dlz_mysql/lib/mysql and $use_dlz_mysql/include/mysql]) -+ ;; -+esac -+ -+AC_SUBST(DLZ_MYSQL_INC) -+AC_SUBST(DLZ_MYSQL_LIBS) -+AC_SUBST(USE_DLZ_MYSQL) -+ -+ -+# -+# was --with-dlz-bdb specified? -+# -+ -+AC_MSG_CHECKING(for Berkeley DB DLZ driver) -+AC_ARG_WITH(dlz_bdb, -+[ --with-dlz-bdb[=PATH] Build with Berkeley DB DLZ driver [yes|no|path]. -+ (Required to use Berkeley DB with DLZ)], -+ use_dlz_bdb="$withval", use_dlz_bdb="no") -+ -+case "$use_dlz_bdb" in -+ no) -+ AC_MSG_RESULT(no) -+ ;; -+ *) -+ #set use_dlz = "yes" so the DLZ core will be built -+ use_dlz=yes -+ if test "$use_dlz_bdb" = "yes" -+ then -+ # User did not specify a path - guess it -+ bdbdirs="/usr /usr/local /usr/pkg" -+ for d in $bdbdirs -+ do -+ if test -f $d/include/db.h -+ then -+ use_dlz_bdb=$d -+ break -+ fi -+ done -+ if test "$use_dlz_bdb" = "yes" -+ then -+ AC_MSG_RESULT(not found) -+ AC_MSG_ERROR( -+[Berkeley DB was not found in any of $bdbdirs; use --with-dlz-bdb=/path]) -+ fi -+ fi -+ -+ USE_DLZ_BDB='-DDLZ_BDB' -+ DLZ_BDB_INC="-I$use_dlz_bdb/include" -+ DLZ_BDB_LIBS="-L$use_dlz_bdb/lib -ldb" -+ AC_MSG_RESULT( -+[using Berkeley DB from $use_dlz_bdb/lib and $use_dlz_bdb/include]) -+ ;; -+esac -+ -+AC_SUBST(DLZ_BDB_INC) -+AC_SUBST(DLZ_BDB_LIBS) -+AC_SUBST(USE_DLZ_BDB) -+ -+ -+# -+# was --with-dlz-filesystem specified? -+# -+ -+AC_MSG_CHECKING(for file system DLZ driver) -+AC_ARG_WITH(dlz_filesystem, -+[ --with-dlz-filesystem[=PATH] Build with filesystem DLZ driver [yes|no]. -+ (Required to use file system driver with DLZ)], -+ use_dlz_filesystem="$withval", use_dlz_filesystem="no") -+ -+case "$use_dlz_filesystem" in -+ no) -+ AC_MSG_RESULT(no) -+ ;; -+ *) -+ #set use_dlz = "yes" so the DLZ core will be built -+ use_dlz=yes -+ USE_DLZ_FILESYSTEM='-DDLZ_FILESYSTEM' -+ AC_MSG_RESULT(yes) -+ ;; -+esac -+ -+AC_SUBST(USE_DLZ_FILESYSTEM) -+ -+ -+# -+# was --with-dlz-stub specified? -+# -+ -+AC_MSG_CHECKING(for stub DLZ driver) -+AC_ARG_WITH(dlz_stub, -+[ --with-dlz-stub[=PATH] Build with stub DLZ driver [yes|no]. -+ (Required to use stub driver with DLZ)], -+ use_dlz_stub="$withval", use_dlz_stub="no") -+ -+case "$use_dlz_stub" in -+ no) -+ AC_MSG_RESULT(no) -+ ;; -+ *) -+ #set use_dlz = "yes" so the DLZ core will be built -+ use_dlz=yes -+ USE_DLZ_STUB='-DDLZ_STUB' -+ AC_MSG_RESULT(yes) -+ ;; -+esac -+ -+AC_SUBST(USE_DLZ_STUB) -+ -+ -+# -+# If any DLZ driver is built, the DLZ core is built too. -+# -+ -+AC_MSG_CHECKING(for DLZ) -+ -+# check if any DLZ driver was built -+if test "$use_dlz" = "yes" -+then -+ AC_MSG_RESULT(yes) -+ USE_DLZ="-DDLZ" -+else -+ AC_MSG_RESULT(no) -+fi -+ -+AC_SUBST(USE_DLZ) -+ -+ -+# - # was --with-openssl specified? - # - AC_MSG_CHECKING(for OpenSSL library) -@@@@ -1710,6 +1936,7 @@@@ - lib/tests/include/Makefile - lib/tests/include/tests/Makefile - bin/Makefile -+ bin/dlzbdb/Makefile - bin/check/Makefile - bin/named/Makefile - bin/named/unix/Makefile diff -Naur bind-9.2.1-orig/lib/dns/Makefile.in bind-9.2.1/lib/dns/Makefile.in --- bind-9.2.1-orig/lib/dns/Makefile.in Wed Nov 14 19:24:06 2001 +++ bind-9.2.1/lib/dns/Makefile.in Mon Apr 7 19:59:24 2003 --- configure.dist Tue Mar 4 15:48:27 2003 +++ configure Sun Apr 13 18:28:58 2003 @@@@ -1007,6 +1007,17 @@@@ --with-gnu-ld assume the C compiler uses GNU ld default=no --with-pic try to use only PIC/non-PIC objects default=use both --with-kame=PATH use Kame IPv6 default path /usr/local/v6 + --with-dlz-postgres[=PATH] Build with Postgres DLZ driver [yes|no|path]. + (Required to use Postgres with DLZ)" + --with-dlz-mysql[=PATH] Build with MySQL DLZ driver [yes|no|path]. + (Required to use MySQL with DLZ)" + --with-dlz-bdb[=PATH] Build with Berkeley DB DLZ driver [yes|no|path]. + (Required to use Berkeley DB with DLZ)" + --with-dlz-filesystem[=PATH] Build with filesystem DLZ driver [yes|no]. + (Required to use file system driver with DLZ)" + --with-dlz-stub[=PATH] Build with stub DLZ driver [yes|no]. + (Required to use stub driver with DLZ)" + Some influential environment variables: CC C compiler command @@@@ -4111,6 +4122,251 @@@@ { (exit 1); exit 1; }; } ;; esac d11 25 a35 245 + # +# Build DLZ support? +# +# The use_dlz flag is set to no. If one of the DLZ drivers is selected +# for build the use_dlz flag will be set to yes +# + +use_dlz=no + +# +# was --with-dlz-postgres specified? +# + +echo $ac_n "checking for Postgres DLZ driver""... $ac_c" 1>&6 +echo "configure:2286: checking for Postgres DLZ driver" >&5 +# Check whether --with-dlz_postgres or --without-dlz_postgres was given. +if test "${with_dlz_postgres+set}" = set; then + withval="$with_dlz_postgres" + use_dlz_postgres="$withval" +else + use_dlz_postgres="no" +fi + + +case "$use_dlz_postgres" in + no) + echo "$ac_t""no" 1>&6 + ;; + *) + #set use_dlz = "yes" so the DLZ core will be built + use_dlz=yes + if test "$use_dlz_postgres" = "yes" + then + # User did not specify a path - guess it + pgdirs="/usr /usr/local /usr/local/pgsql /usr/pkg" + for d in $pgdirs + do + if test -f $d/include/libpq-fe.h + then + use_dlz_postgres=$d + break + fi + done + if test "$use_dlz_postgres" = "yes" + then + echo "$ac_t""not found" 1>&6 + { echo "configure: error: PostgreSQL was not found in any of $pgdirs; use --with-dlz-postgres=/path" 1>&2; exit 1; } + fi + fi + USE_DLZ_POSTGRES='-DDLZ_POSTGRES' + DLZ_POSTGRES_INC="-I$use_dlz_postgres/include" + DLZ_POSTGRES_LIBS="-L$use_dlz_postgres/lib -lpq" + echo "$ac_t""using PostgreSQL from $use_dlz_postgres/lib and $use_dlz_postgres/include" 1>&6 + ;; +esac + + + + + + + +# +# was --with-dlz-mysql specified? +# + +echo $ac_n "checking for MySQL DLZ driver""... $ac_c" 1>&6 +echo "configure:2339: checking for MySQL DLZ driver" >&5 +# Check whether --with-dlz_mysql or --without-dlz_mysql was given. +if test "${with_dlz_mysql+set}" = set; then + withval="$with_dlz_mysql" + use_dlz_mysql="$withval" +else + use_dlz_mysql="no" +fi + + +case "$use_dlz_mysql" in + no) + echo "$ac_t""no" 1>&6 + ;; + *) + #set use_dlz = "yes" so the DLZ core will be built + use_dlz=yes + if test "$use_dlz_mysql" = "yes" + then + # User did not specify a path - guess it + mysqldirs="/usr /usr/local /usr/local/mysql /usr/pkg" + for d in $mysqldirs + do + if test -f $d/include/mysql/mysql.h + then + use_dlz_mysql=$d + break + fi + done + if test "$use_dlz_mysql" = "yes" + then + echo "$ac_t""not found" 1>&6 + { echo "configure: error: MySQL was not found in any of $mysqldirs; use --with-dlz-mysql=/path" 1>&2; exit 1; } + fi + fi + USE_DLZ_MYSQL='-DDLZ_MYSQL' + DLZ_MYSQL_INC="-I$use_dlz_mysql/include/mysql" + DLZ_MYSQL_LIBS="-L$use_dlz_mysql/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm" + echo "$ac_t""using mysql from $use_dlz_mysql/lib/mysql and $use_dlz_mysql/include/mysql" 1>&6 + ;; +esac + + + + + + +# +# was --with-dlz-bdb specified? +# + +echo $ac_n "checking for Berkeley DB DLZ driver""... $ac_c" 1>&6 +echo "configure:2391: checking for Berkeley DB DLZ driver" >&5 +# Check whether --with-dlz_bdb or --without-dlz_bdb was given. +if test "${with_dlz_bdb+set}" = set; then + withval="$with_dlz_bdb" + use_dlz_bdb="$withval" +else + use_dlz_bdb="no" +fi + + +case "$use_dlz_bdb" in + no) + echo "$ac_t""no" 1>&6 + ;; + *) + #set use_dlz = "yes" so the DLZ core will be built + use_dlz=yes + if test "$use_dlz_bdb" = "yes" + then + # User did not specify a path - guess it + bdbdirs="/usr /usr/local /usr/pkg" + for d in $bdbdirs + do + if test -f $d/include/db.h + then + use_dlz_bdb=$d + break + fi + done + if test "$use_dlz_bdb" = "yes" + then + echo "$ac_t""not found" 1>&6 + { echo "configure: error: Berkeley DB was not found in any of $bdbdirs; use --with-dlz-bdb=/path" 1>&2; exit 1; } + fi + fi + + USE_DLZ_BDB='-DDLZ_BDB' + DLZ_BDB_INC="-I$use_dlz_bdb/include" + DLZ_BDB_LIBS="-L$use_dlz_bdb/lib -ldb" + echo "$ac_t""using Berkeley DB from $use_dlz_bdb/lib and $use_dlz_bdb/include" 1>&6 + ;; +esac + + + + + + +# +# was --with-dlz-filesystem specified? +# + +echo $ac_n "checking for file system DLZ driver""... $ac_c" 1>&6 +echo "configure:2444: checking for file system DLZ driver" >&5 +# Check whether --with-dlz_filesystem or --without-dlz_filesystem was given. +if test "${with_dlz_filesystem+set}" = set; then + withval="$with_dlz_filesystem" + use_dlz_filesystem="$withval" +else + use_dlz_filesystem="no" +fi + + +case "$use_dlz_filesystem" in + no) + echo "$ac_t""no" 1>&6 + ;; + *) + #set use_dlz = "yes" so the DLZ core will be built + use_dlz=yes + USE_DLZ_FILESYSTEM='-DDLZ_FILESYSTEM' + echo "$ac_t""yes" 1>&6 + ;; +esac + + + + + +# +# was --with-dlz-stub specified? +# + +echo $ac_n "checking for stub DLZ driver""... $ac_c" 1>&6 +echo "configure:2474: checking for stub DLZ driver" >&5 +# Check whether --with-dlz_stub or --without-dlz_stub was given. +if test "${with_dlz_stub+set}" = set; then + withval="$with_dlz_stub" + use_dlz_stub="$withval" +else + use_dlz_stub="no" +fi + + +case "$use_dlz_stub" in + no) + echo "$ac_t""no" 1>&6 + ;; + *) + #set use_dlz = "yes" so the DLZ core will be built + use_dlz=yes + USE_DLZ_STUB='-DDLZ_STUB' + echo "$ac_t""yes" 1>&6 + ;; +esac + + + + +# +# If any DLZ driver is built, the DLZ core is built too. +# + +echo $ac_n "checking for DLZ""... $ac_c" 1>&6 +echo "configure:2504: checking for DLZ" >&5 + +# check if any DLZ driver was built +if test "$use_dlz" = "yes" +then + echo "$ac_t""yes" 1>&6 + USE_DLZ="-DDLZ" +else + echo "$ac_t""no" 1>&6 +fi + + d37 51 a87 3 # # was --with-openssl specified? @@@@ -13314,7 +13570,7 @@@@ d89 59 a147 1 LIBLWRES_API=$srcdir/lib/lwres/api d149 2 a150 32 -ac_config_files="$ac_config_files make/rules make/includes Makefile make/Makefile make/mkdep lib/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/nls/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/sec/Makefile lib/dns/sec/dst/Makefile lib/dns/sec/dst/include/Makefile lib/dns/sec/dst/include/dst/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/lwres/win32/Makefile lib/lwres/win32/include/Makefile lib/lwres/win32/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile bin/Makefile bin/check/Makefile bin/named/Makefile bin/named/unix/Makefile bin/rndc/Makefile bin/rndc/unix/Makefile bin/dig/Makefile bin/nsupdate/Makefile bin/tests/Makefile bin/tests/names/Makefile bin/tests/master/Makefile bin/tests/rbt/Makefile bin/tests/db/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/dst/Makefile bin/tests/mem/Makefile bin/tests/net/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/lwresd/Makefile bin/tests/system/tkey/Makefile bin/tests/headerdep_test.sh bin/dnssec/Makefile doc/Makefile doc/arm/Makefile doc/arm/nominum-docbook-html.dsl doc/arm/nominum-docbook-print.dsl doc/arm/validate.sh doc/misc/Makefile docutil/docbook2man-wrapper.sh isc-config.sh" +ac_config_files="$ac_config_files make/rules make/includes Makefile make/Makefile make/mkdep lib/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/nls/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/sec/Makefile lib/dns/sec/dst/Makefile lib/dns/sec/dst/include/Makefile lib/dns/sec/dst/include/dst/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/lwres/win32/Makefile lib/lwres/win32/include/Makefile lib/lwres/win32/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile bin/Makefile bin/dlzbdb/Makefile bin/check/Makefile bin/named/Makefile bin/named/unix/Makefile bin/rndc/Makefile bin/rndc/unix/Makefile bin/dig/Makefile bin/nsupdate/Makefile bin/tests/Makefile bin/tests/names/Makefile bin/tests/master/Makefile bin/tests/rbt/Makefile bin/tests/db/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/dst/Makefile bin/tests/mem/Makefile bin/tests/net/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/lwresd/Makefile bin/tests/system/tkey/Makefile bin/tests/headerdep_test.sh bin/dnssec/Makefile doc/Makefile doc/arm/Makefile doc/arm/nominum-docbook-html.dsl doc/arm/nominum-docbook-print.dsl doc/arm/validate.sh doc/misc/Makefile docutil/docbook2man-wrapper.sh isc-config.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@@@ -13832,6 +14088,7 @@@@ "lib/tests/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/tests/include/Makefile" ;; "lib/tests/include/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/tests/include/tests/Makefile" ;; "bin/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;; + "bin/dlzbdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/dlzbdb/Makefile" ;; "bin/check/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/check/Makefile" ;; "bin/named/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/named/Makefile" ;; "bin/named/unix/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/named/unix/Makefile" ;; @@@@ -13981,6 +14238,18 @@@@ s,@@ISC_PLATFORM_HAVELONGLONG@@,$ISC_PLATFORM_HAVELONGLONG,;t t s,@@ISC_PLATFORM_NEEDSYSSELECTH@@,$ISC_PLATFORM_NEEDSYSSELECTH,;t t s,@@LWRES_PLATFORM_NEEDSYSSELECTH@@,$LWRES_PLATFORM_NEEDSYSSELECTH,;t t +s,@@DLZ_POSTGRES_INC@@,$DLZ_POSTGRES_INC,g +s,@@DLZ_POSTGRES_LIBS@@,$DLZ_POSTGRES_LIBS,g +s,@@USE_DLZ_POSTGRES@@,$USE_DLZ_POSTGRES,g +s,@@DLZ_MYSQL_INC@@,$DLZ_MYSQL_INC,g +s,@@DLZ_MYSQL_LIBS@@,$DLZ_MYSQL_LIBS,g +s,@@USE_DLZ_MYSQL@@,$USE_DLZ_MYSQL,g +s,@@DLZ_BDB_INC@@,$DLZ_BDB_INC,g +s,@@DLZ_BDB_LIBS@@,$DLZ_BDB_LIBS,g +s,@@USE_DLZ_BDB@@,$USE_DLZ_BDB,g +s,@@USE_DLZ_FILESYSTEM@@,$USE_DLZ_FILESYSTEM,g +s,@@USE_DLZ_STUB@@,$USE_DLZ_STUB,g +s,@@USE_DLZ@@,$USE_DLZ,g s,@@DST_OPENSSL_INC@@,$DST_OPENSSL_INC,;t t s,@@DNS_OPENSSL_LIBS@@,$DNS_OPENSSL_LIBS,;t t s,@@USE_OPENSSL@@,$USE_OPENSSL,;t t @ 1.5.12.1 log @MFC: apply vendor security fixes (CVE-2006-4095, CVE-2006-4096) @ text @d1 3245 a3245 9 Security Fixes (BIND 9.3.2-P1): - SIG Query Processing (CVE-2006-4095) - Excessive Recursive Queries INSIST failure (CVE-2006-4096) Index: bin/named/query.c --- bin/named/query.c.orig 2005-08-11 07:25:20 +0200 +++ bin/named/query.c 2006-09-07 08:14:50 +0200 @@@@ -2393,7 +2393,7 @@@@ is_zone = ISC_FALSE; d3247 245 a3491 25 qtype = event->qtype; - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; @@@@ -2434,7 +2434,7 @@@@ /* * If it's a SIG query, we'll iterate the node. */ - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; Index: lib/dns/resolver.c --- lib/dns/resolver.c.orig 2005-10-14 03:38:48 +0200 +++ lib/dns/resolver.c 2006-09-07 08:14:50 +0200 @@@@ -762,7 +762,8 @@@@ INSIST(result != ISC_R_SUCCESS || dns_rdataset_isassociated(event->rdataset) || fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig); + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig); d3493 3 a3495 51 isc_task_sendanddetach(&task, ISC_EVENT_PTR(&event)); } @@@@ -3188,7 +3189,8 @@@@ if (hevent != NULL) { if (!negative && !chaining && (fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig)) { + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig)) { /* * Don't bind rdatasets; the caller * will iterate the node. @@@@ -3306,7 +3308,8 @@@@ if (!ISC_LIST_EMPTY(fctx->validators)) { INSIST(!negative); INSIST(fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig); + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig); /* * Don't send a response yet - we have * more rdatasets that still need to @@@@ -3455,14 +3458,15 @@@@ return (result); anodep = &event->node; /* - * If this is an ANY or SIG query, we're not going - * to return any rdatasets, unless we encountered + * If this is an ANY, SIG or RRSIG query, we're not + * going to return any rdatasets, unless we encountered * a CNAME or DNAME as "the answer". In this case, * we're going to return DNS_R_CNAME or DNS_R_DNAME * and we must set up the rdatasets. */ if ((fctx->type != dns_rdatatype_any && - fctx->type != dns_rdatatype_rrsig) || + fctx->type != dns_rdatatype_rrsig && + fctx->type != dns_rdatatype_sig) || (name->attributes & DNS_NAMEATTR_CHAINING) != 0) { ardataset = event->rdataset; asigrdataset = event->sigrdataset; @@@@ -3521,7 +3525,7 @@@@ */ if (secure_domain && rdataset->trust != dns_trust_glue) { /* - * SIGs are validated as part of validating the + * RRSIGs are validated as part of validating the * type they cover. */ if (rdataset->type == dns_rdatatype_rrsig) @@@@ -3591,7 +3595,8 @@@@ d3497 1 a3497 59 if (ANSWER(rdataset) && need_validation) { if (fctx->type != dns_rdatatype_any && - fctx->type != dns_rdatatype_rrsig) { + fctx->type != dns_rdatatype_rrsig && + fctx->type != dns_rdatatype_sig) { /* * This is The Answer. We will * validate it, but first we cache @@@@ -3763,23 +3768,28 @@@@ isc_result_t *eresultp) { isc_result_t result; + dns_rdataset_t rdataset; + + if (ardataset == NULL) { + dns_rdataset_init(&rdataset); + ardataset = &rdataset; + } result = dns_ncache_add(message, cache, node, covers, now, maxttl, ardataset); - if (result == DNS_R_UNCHANGED) { + if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) { /* - * The data in the cache are better than the negative cache - * entry we're trying to add. + * If the cache now contains a negative entry and we + * care about whether it is DNS_R_NCACHENXDOMAIN or + * DNS_R_NCACHENXRRSET then extract it. */ - if (ardataset != NULL && ardataset->type == 0) { + if (ardataset->type == 0) { /* - * The cache data is also a negative cache - * entry. + * The cache data is a negative cache entry. */ if (NXDOMAIN(ardataset)) *eresultp = DNS_R_NCACHENXDOMAIN; else *eresultp = DNS_R_NCACHENXRRSET; - result = ISC_R_SUCCESS; } else { /* * Either we don't care about the nature of the @@@@ -3791,14 +3801,11 @@@@ * XXXRTH There's a CNAME/DNAME problem here. */ *eresultp = ISC_R_SUCCESS; - result = ISC_R_SUCCESS; } - } else if (result == ISC_R_SUCCESS) { - if (NXDOMAIN(ardataset)) - *eresultp = DNS_R_NCACHENXDOMAIN; - else - *eresultp = DNS_R_NCACHENXRRSET; + result = ISC_R_SUCCESS; } + if (ardataset == &rdataset && dns_rdataset_isassociated(ardataset)) + dns_rdataset_disassociate(ardataset); d3499 32 a3530 2 return (result); } @ 1.5.14.1 log @MFC: apply vendor security fixes (CVE-2006-4095, CVE-2006-4096) @ text @d1 3245 a3245 9 Security Fixes (BIND 9.3.2-P1): - SIG Query Processing (CVE-2006-4095) - Excessive Recursive Queries INSIST failure (CVE-2006-4096) Index: bin/named/query.c --- bin/named/query.c.orig 2005-08-11 07:25:20 +0200 +++ bin/named/query.c 2006-09-07 08:14:50 +0200 @@@@ -2393,7 +2393,7 @@@@ is_zone = ISC_FALSE; d3247 245 a3491 25 qtype = event->qtype; - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; @@@@ -2434,7 +2434,7 @@@@ /* * If it's a SIG query, we'll iterate the node. */ - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; Index: lib/dns/resolver.c --- lib/dns/resolver.c.orig 2005-10-14 03:38:48 +0200 +++ lib/dns/resolver.c 2006-09-07 08:14:50 +0200 @@@@ -762,7 +762,8 @@@@ INSIST(result != ISC_R_SUCCESS || dns_rdataset_isassociated(event->rdataset) || fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig); + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig); d3493 3 a3495 51 isc_task_sendanddetach(&task, ISC_EVENT_PTR(&event)); } @@@@ -3188,7 +3189,8 @@@@ if (hevent != NULL) { if (!negative && !chaining && (fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig)) { + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig)) { /* * Don't bind rdatasets; the caller * will iterate the node. @@@@ -3306,7 +3308,8 @@@@ if (!ISC_LIST_EMPTY(fctx->validators)) { INSIST(!negative); INSIST(fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig); + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig); /* * Don't send a response yet - we have * more rdatasets that still need to @@@@ -3455,14 +3458,15 @@@@ return (result); anodep = &event->node; /* - * If this is an ANY or SIG query, we're not going - * to return any rdatasets, unless we encountered + * If this is an ANY, SIG or RRSIG query, we're not + * going to return any rdatasets, unless we encountered * a CNAME or DNAME as "the answer". In this case, * we're going to return DNS_R_CNAME or DNS_R_DNAME * and we must set up the rdatasets. */ if ((fctx->type != dns_rdatatype_any && - fctx->type != dns_rdatatype_rrsig) || + fctx->type != dns_rdatatype_rrsig && + fctx->type != dns_rdatatype_sig) || (name->attributes & DNS_NAMEATTR_CHAINING) != 0) { ardataset = event->rdataset; asigrdataset = event->sigrdataset; @@@@ -3521,7 +3525,7 @@@@ */ if (secure_domain && rdataset->trust != dns_trust_glue) { /* - * SIGs are validated as part of validating the + * RRSIGs are validated as part of validating the * type they cover. */ if (rdataset->type == dns_rdatatype_rrsig) @@@@ -3591,7 +3595,8 @@@@ d3497 1 a3497 59 if (ANSWER(rdataset) && need_validation) { if (fctx->type != dns_rdatatype_any && - fctx->type != dns_rdatatype_rrsig) { + fctx->type != dns_rdatatype_rrsig && + fctx->type != dns_rdatatype_sig) { /* * This is The Answer. We will * validate it, but first we cache @@@@ -3763,23 +3768,28 @@@@ isc_result_t *eresultp) { isc_result_t result; + dns_rdataset_t rdataset; + + if (ardataset == NULL) { + dns_rdataset_init(&rdataset); + ardataset = &rdataset; + } result = dns_ncache_add(message, cache, node, covers, now, maxttl, ardataset); - if (result == DNS_R_UNCHANGED) { + if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) { /* - * The data in the cache are better than the negative cache - * entry we're trying to add. + * If the cache now contains a negative entry and we + * care about whether it is DNS_R_NCACHENXDOMAIN or + * DNS_R_NCACHENXRRSET then extract it. */ - if (ardataset != NULL && ardataset->type == 0) { + if (ardataset->type == 0) { /* - * The cache data is also a negative cache - * entry. + * The cache data is a negative cache entry. */ if (NXDOMAIN(ardataset)) *eresultp = DNS_R_NCACHENXDOMAIN; else *eresultp = DNS_R_NCACHENXRRSET; - result = ISC_R_SUCCESS; } else { /* * Either we don't care about the nature of the @@@@ -3791,14 +3801,11 @@@@ * XXXRTH There's a CNAME/DNAME problem here. */ *eresultp = ISC_R_SUCCESS; - result = ISC_R_SUCCESS; } - } else if (result == ISC_R_SUCCESS) { - if (NXDOMAIN(ardataset)) - *eresultp = DNS_R_NCACHENXDOMAIN; - else - *eresultp = DNS_R_NCACHENXRRSET; + result = ISC_R_SUCCESS; } + if (ardataset == &rdataset && dns_rdataset_isassociated(ardataset)) + dns_rdataset_disassociate(ardataset); d3499 32 a3530 2 return (result); } @ 1.5.14.2 log @MFC: security fixed latest upstream version @ text @@ 1.4 log @upgrade DLZ patch 0.3.0 -> 0.4.0, fix with_dlz_stub @ text @@ 1.3 log @option for Dynamically Loadable Zones, still unstable and only minimally tested @ text @d1 3 a3 3 --- dlz.patch.dist Tue Mar 4 15:24:31 2003 +++ dlz.patch Tue Mar 4 15:46:48 2003 @@@@ -4800,2900 +4800,6 @@@@ d8 3 a10 3 ---- bind-9.2.1-orig/configure Tue Dec 4 21:30:08 2001 -+++ bind-9.2.1/configure Mon Sep 23 19:15:20 2002 -@@@@ -179,6 +179,18 @@@@ d20 3 d32 1 a32 1 -@@@@ -911,7 +923,7 @@@@ d37 1 a37 1 -+echo "configure:927: checking host system type" >&5 d41 1 a41 1 -@@@@ -933,7 +945,7 @@@@ d46 1 a46 1 -+echo "configure:949: checking whether ${MAKE-make} sets \${MAKE}" >&5 d50 1 a50 1 -@@@@ -962,7 +974,7 @@@@ d55 1 a55 1 -+echo "configure:978: checking for $ac_word" >&5 d59 1 a59 1 -@@@@ -1001,7 +1013,7 @@@@ d64 1 a64 1 -+echo "configure:1017: checking for a BSD compatible install" >&5 d68 1 a68 1 -@@@@ -1062,7 +1074,7 @@@@ d73 1 a73 1 -+echo "configure:1078: checking for $ac_word" >&5 d77 1 a77 1 -@@@@ -1121,7 +1133,7 @@@@ d82 1 a82 1 -+echo "configure:1137: checking for $ac_word" >&5 d86 1 a86 1 -@@@@ -1163,7 +1175,7 @@@@ d91 1 a91 1 -+echo "configure:1179: checking for Exuberant Ctags etags" >&5 d95 1 a95 1 -@@@@ -1181,7 +1193,7 @@@@ d100 1 a100 1 -+echo "configure:1197: checking for $ac_word" >&5 d104 1 a104 1 -@@@@ -1328,7 +1340,7 @@@@ d109 1 a109 1 -+echo "configure:1344: checking for $ac_word" >&5 d113 1 a113 1 -@@@@ -1358,7 +1370,7 @@@@ d118 1 a118 1 -+echo "configure:1374: checking for $ac_word" >&5 d122 1 a122 1 -@@@@ -1409,7 +1421,7 @@@@ d127 1 a127 1 -+echo "configure:1425: checking for $ac_word" >&5 d131 1 a131 1 -@@@@ -1441,7 +1453,7 @@@@ d136 1 a136 1 -+echo "configure:1457: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 d140 1 a140 1 -@@@@ -1452,12 +1464,12 @@@@ d145 1 a145 1 -+#line 1468 "configure" d151 1 a151 1 -+if { (eval echo configure:1473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d155 1 a155 1 -@@@@ -1483,12 +1495,12 @@@@ d160 1 a160 1 -+echo "configure:1499: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 d166 1 a166 1 -+echo "configure:1504: checking whether we are using GNU C" >&5 d170 1 a170 1 -@@@@ -1497,7 +1509,7 @@@@ d175 1 a175 1 -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then d179 1 a179 1 -@@@@ -1516,7 +1528,7 @@@@ d184 1 a184 1 -+echo "configure:1532: checking whether ${CC-cc} accepts -g" >&5 d188 1 a188 1 -@@@@ -1549,7 +1561,7 @@@@ d193 1 a193 1 -+echo "configure:1565: checking how to run the C preprocessor" >&5 d197 1 a197 1 -@@@@ -1564,13 +1576,13 @@@@ d202 1 a202 1 -+#line 1580 "configure" d209 1 a209 1 -+{ (eval echo configure:1586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } d213 1 a213 1 -@@@@ -1581,13 +1593,13 @@@@ d218 1 a218 1 -+#line 1597 "configure" d225 1 a225 1 -+{ (eval echo configure:1603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } d229 1 a229 1 -@@@@ -1598,13 +1610,13 @@@@ d234 1 a234 1 -+#line 1614 "configure" d241 1 a241 1 -+{ (eval echo configure:1620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } d245 1 a245 1 -@@@@ -1629,12 +1641,12 @@@@ d250 1 a250 1 -+echo "configure:1645: checking for ANSI C header files" >&5 d256 1 a256 1 -+#line 1650 "configure" d260 1 a260 1 -@@@@ -1642,7 +1654,7 @@@@ d265 1 a265 1 -+{ (eval echo configure:1658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } d269 1 a269 1 -@@@@ -1659,7 +1671,7 @@@@ d274 1 a274 1 -+#line 1675 "configure" d278 1 a278 1 -@@@@ -1677,7 +1689,7 @@@@ d283 1 a283 1 -+#line 1693 "configure" d287 1 a287 1 -@@@@ -1698,7 +1710,7 @@@@ d292 1 a292 1 -+#line 1714 "configure" d296 1 a296 1 -@@@@ -1709,7 +1721,7 @@@@ d301 1 a301 1 -+if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d305 1 a305 1 -@@@@ -1737,17 +1749,17 @@@@ d310 1 a310 1 -+echo "configure:1753: checking for $ac_hdr" >&5 d316 1 a316 1 -+#line 1758 "configure" d322 1 a322 1 -+{ (eval echo configure:1763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } d326 1 a326 1 -@@@@ -1775,12 +1787,12 @@@@ d331 1 a331 1 -+echo "configure:1791: checking for working const" >&5 d337 1 a337 1 -+#line 1796 "configure" d341 1 a341 1 -@@@@ -1829,7 +1841,7 @@@@ d346 1 a346 1 -+if { (eval echo configure:1845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d350 1 a350 1 -@@@@ -1850,21 +1862,21 @@@@ d355 1 a355 1 -+echo "configure:1866: checking for inline" >&5 d363 1 a363 1 -+#line 1873 "configure" d371 1 a371 1 -+if { (eval echo configure:1880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d375 1 a375 1 -@@@@ -1890,12 +1902,12 @@@@ d380 1 a380 1 -+echo "configure:1906: checking for sysctlbyname" >&5 d386 1 a386 1 -+#line 1911 "configure" d390 1 a390 1 -@@@@ -1918,7 +1930,7 @@@@ d395 1 a395 1 -+if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d399 1 a399 1 -@@@@ -1946,9 +1958,9 @@@@ d404 1 a404 1 -+echo "configure:1962: checking for static inline breakage" >&5 d407 1 a407 1 -+#line 1964 "configure" d411 1 a411 1 -@@@@ -1965,7 +1977,7 @@@@ d416 1 a416 1 -+if { (eval echo configure:1981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d420 1 a420 1 -@@@@ -1981,12 +1993,12 @@@@ d425 1 a425 1 -+echo "configure:1997: checking for size_t" >&5 d431 1 a431 1 -+#line 2002 "configure" d435 1 a435 1 -@@@@ -2014,12 +2026,12 @@@@ d440 1 a440 1 -+echo "configure:2030: checking for ssize_t" >&5 d446 1 a446 1 -+#line 2035 "configure" d450 1 a450 1 -@@@@ -2047,12 +2059,12 @@@@ d455 1 a455 1 -+echo "configure:2063: checking whether time.h and sys/time.h may both be included" >&5 d461 1 a461 1 -+#line 2068 "configure" d465 1 a465 1 -@@@@ -2061,7 +2073,7 @@@@ d470 1 a470 1 -+if { (eval echo configure:2077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d474 1 a474 1 -@@@@ -2082,16 +2094,16 @@@@ d479 1 a479 1 -+echo "configure:2098: checking for long long" >&5 d482 1 a482 1 -+#line 2100 "configure" d490 1 a490 1 -+if { (eval echo configure:2107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d494 1 a494 1 -@@@@ -2111,9 +2123,9 @@@@ d499 1 a499 1 -+echo "configure:2127: checking if unistd.h defines fd_set" >&5 d502 1 a502 1 -+#line 2129 "configure" d506 1 a506 1 -@@@@ -2121,7 +2133,7 @@@@ d511 1 a511 1 -+if { (eval echo configure:2137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d515 1 a515 1 -@@@@ -2163,14 +2175,14 @@@@ d520 1 a520 1 -+echo "configure:2179: checking whether byte ordering is bigendian" >&5 d528 1 a528 1 -+#line 2186 "configure" d532 1 a532 1 -@@@@ -2181,11 +2193,11 @@@@ d537 1 a537 1 -+if { (eval echo configure:2197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d542 1 a542 1 -+#line 2201 "configure" d546 1 a546 1 -@@@@ -2196,7 +2208,7 @@@@ d551 1 a551 1 -+if { (eval echo configure:2212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d555 1 a555 1 -@@@@ -2216,7 +2228,7 @@@@ d560 1 a560 1 -+#line 2232 "configure" d564 1 a564 1 -@@@@ -2229,7 +2241,7 @@@@ d569 1 a569 1 -+if { (eval echo configure:2245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d573 1 a573 1 -@@@@ -2254,10 +2266,203 @@@@ d590 1 a590 1 -+echo "configure:2283: checking for Postgres DLZ driver" >&5 d643 1 a643 1 -+echo "configure:2336: checking for MySQL DLZ driver" >&5 d681 1 a681 1 -+ echo "$ac_t""using mysqlQL from $use_dlz_mysql/lib/mysql and $use_dlz_mysql/include/mysql" 1>&6 d689 54 a742 1 -+ d748 1 a748 1 -+echo "configure:2388: checking for file system DLZ driver" >&5 d778 1 a778 1 -+echo "configure:2418: checking for stub DLZ driver" >&5 d808 1 a808 1 -+echo "configure:2448: checking for DLZ" >&5 d827 1 a827 1 -+echo "configure:2466: checking for OpenSSL library" >&5 d831 1 a831 1 -@@@@ -2298,7 +2503,7 @@@@ d836 1 a836 1 -+echo "configure:2507: checking OpenSSL library version" >&5 d840 1 a840 1 -@@@@ -2307,7 +2512,7 @@@@ d845 1 a845 1 -+#line 2516 "configure" d849 1 a849 1 -@@@@ -2322,7 +2527,7 @@@@ d854 1 a854 1 -+if { (eval echo configure:2531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d858 1 a858 1 -@@@@ -2387,7 +2592,7 @@@@ d863 1 a863 1 -+echo "configure:2596: checking for random device" >&5 d867 1 a867 1 -@@@@ -2411,7 +2616,7 @@@@ d872 1 a872 1 -+echo "configure:2620: checking for $devrandom" >&5 d876 1 a876 1 -@@@@ -2463,7 +2668,7 @@@@ d881 1 a881 1 -+echo "configure:2672: checking whether to build with thread support" >&5 d885 1 a885 1 -@@@@ -2551,7 +2756,7 @@@@ d890 1 a890 1 -+echo "configure:2760: checking which NetBSD thread library to use" >&5 d894 1 a894 1 -@@@@ -2590,7 +2795,7 @@@@ d899 1 a899 1 -+echo "configure:2799: checking for pthread_create in -lpthread" >&5 d903 1 a903 1 -@@@@ -2598,7 +2803,7 @@@@ d908 1 a908 1 -+#line 2807 "configure" d912 1 a912 1 -@@@@ -2609,7 +2814,7 @@@@ d917 1 a917 1 -+if { (eval echo configure:2818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d921 1 a921 1 -@@@@ -2635,7 +2840,7 @@@@ d926 1 a926 1 -+echo "configure:2844: checking for __pthread_create in -lpthread" >&5 d930 1 a930 1 -@@@@ -2643,7 +2848,7 @@@@ d935 1 a935 1 -+#line 2852 "configure" d939 1 a939 1 -@@@@ -2654,7 +2859,7 @@@@ d944 1 a944 1 -+if { (eval echo configure:2863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d948 1 a948 1 -@@@@ -2680,7 +2885,7 @@@@ d953 1 a953 1 -+echo "configure:2889: checking for __pthread_create_system in -lpthread" >&5 d957 1 a957 1 -@@@@ -2688,7 +2893,7 @@@@ d962 1 a962 1 -+#line 2897 "configure" d966 1 a966 1 -@@@@ -2699,7 +2904,7 @@@@ d971 1 a971 1 -+if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d975 1 a975 1 -@@@@ -2725,7 +2930,7 @@@@ d980 1 a980 1 -+echo "configure:2934: checking for pthread_create in -lc_r" >&5 d984 1 a984 1 -@@@@ -2733,7 +2938,7 @@@@ d989 1 a989 1 -+#line 2942 "configure" d993 1 a993 1 -@@@@ -2744,7 +2949,7 @@@@ d998 1 a998 1 -+if { (eval echo configure:2953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1002 1 a1002 1 -@@@@ -2770,7 +2975,7 @@@@ d1007 1 a1007 1 -+echo "configure:2979: checking for pthread_create in -lc" >&5 d1011 1 a1011 1 -@@@@ -2778,7 +2983,7 @@@@ d1016 1 a1016 1 -+#line 2987 "configure" d1020 1 a1020 1 -@@@@ -2789,7 +2994,7 @@@@ d1025 1 a1025 1 -+if { (eval echo configure:2998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1029 1 a1029 1 -@@@@ -2835,7 +3040,7 @@@@ d1034 1 a1034 1 -+echo "configure:3044: checking for sigwait in -lc" >&5 d1038 1 a1038 1 -@@@@ -2843,7 +3048,7 @@@@ d1043 1 a1043 1 -+#line 3052 "configure" d1047 1 a1047 1 -@@@@ -2854,7 +3059,7 @@@@ d1052 1 a1052 1 -+if { (eval echo configure:3063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1056 1 a1056 1 -@@@@ -2876,7 +3081,7 @@@@ d1061 1 a1061 1 -+echo "configure:3085: checking for sigwait in -lpthread" >&5 d1065 1 a1065 1 -@@@@ -2884,7 +3089,7 @@@@ d1070 1 a1070 1 -+#line 3093 "configure" d1074 1 a1074 1 -@@@@ -2895,7 +3100,7 @@@@ d1079 1 a1079 1 -+if { (eval echo configure:3104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1083 1 a1083 1 -@@@@ -2917,7 +3122,7 @@@@ d1088 1 a1088 1 -+echo "configure:3126: checking for _Psigwait in -lpthread" >&5 d1092 1 a1092 1 -@@@@ -2925,7 +3130,7 @@@@ d1097 1 a1097 1 -+#line 3134 "configure" d1101 1 a1101 1 -@@@@ -2936,7 +3141,7 @@@@ d1106 1 a1106 1 -+if { (eval echo configure:3145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1110 1 a1110 1 -@@@@ -2966,12 +3171,12 @@@@ d1115 1 a1115 1 -+echo "configure:3175: checking for pthread_attr_getstacksize" >&5 d1121 1 a1121 1 -+#line 3180 "configure" d1125 1 a1125 1 -@@@@ -2994,7 +3199,7 @@@@ d1130 1 a1130 1 -+if { (eval echo configure:3203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1134 1 a1134 1 -@@@@ -3026,7 +3231,7 @@@@ d1139 1 a1139 1 -+echo "configure:3235: checking for sigwait in -lc_r" >&5 d1143 1 a1143 1 -@@@@ -3034,7 +3239,7 @@@@ d1148 1 a1148 1 -+#line 3243 "configure" d1152 1 a1152 1 -@@@@ -3045,7 +3250,7 @@@@ d1157 1 a1157 1 -+if { (eval echo configure:3254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1161 1 a1161 1 -@@@@ -3100,12 +3305,12 @@@@ d1166 1 a1166 1 -+echo "configure:3309: checking for pthread_setconcurrency" >&5 d1172 1 a1172 1 -+#line 3314 "configure" d1176 1 a1176 1 -@@@@ -3128,7 +3333,7 @@@@ d1181 1 a1181 1 -+if { (eval echo configure:3337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1185 1 a1185 1 -@@@@ -3166,12 +3371,12 @@@@ d1190 1 a1190 1 -+echo "configure:3375: checking for sysconf" >&5 d1196 1 a1196 1 -+#line 3380 "configure" d1200 1 a1200 1 -@@@@ -3194,7 +3399,7 @@@@ d1205 1 a1205 1 -+if { (eval echo configure:3403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1209 1 a1209 1 -@@@@ -3275,12 +3480,12 @@@@ d1214 1 a1214 1 -+echo "configure:3484: checking for flockfile" >&5 d1220 1 a1220 1 -+#line 3489 "configure" d1224 1 a1224 1 -@@@@ -3303,7 +3508,7 @@@@ d1229 1 a1229 1 -+if { (eval echo configure:3512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1233 1 a1233 1 -@@@@ -3326,12 +3531,12 @@@@ d1238 1 a1238 1 -+echo "configure:3535: checking for getc_unlocked" >&5 d1244 1 a1244 1 -+#line 3540 "configure" d1248 1 a1248 1 -@@@@ -3354,7 +3559,7 @@@@ d1253 1 a1253 1 -+if { (eval echo configure:3563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1257 1 a1257 1 -@@@@ -3381,7 +3586,7 @@@@ d1262 1 a1262 1 -+echo "configure:3590: checking whether to build with threads" >&5 d1266 1 a1266 1 -@@@@ -3457,12 +3662,12 @@@@ d1271 1 a1271 1 -+echo "configure:3666: checking for catgets" >&5 d1277 1 a1277 1 -+#line 3671 "configure" d1281 1 a1281 1 -@@@@ -3485,7 +3690,7 @@@@ d1286 1 a1286 1 -+if { (eval echo configure:3694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1290 1 a1290 1 -@@@@ -3523,7 +3728,7 @@@@ d1295 1 a1295 1 -+echo "configure:3732: checking for socket in -lsocket" >&5 d1299 1 a1299 1 -@@@@ -3531,7 +3736,7 @@@@ d1304 1 a1304 1 -+#line 3740 "configure" d1308 1 a1308 1 -@@@@ -3542,7 +3747,7 @@@@ d1313 1 a1313 1 -+if { (eval echo configure:3751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1317 1 a1317 1 -@@@@ -3570,7 +3775,7 @@@@ d1322 1 a1322 1 -+echo "configure:3779: checking for inet_ntoa in -lnsl" >&5 d1326 1 a1326 1 -@@@@ -3578,7 +3783,7 @@@@ d1331 1 a1331 1 -+#line 3787 "configure" d1335 1 a1335 1 -@@@@ -3589,7 +3794,7 @@@@ d1340 1 a1340 1 -+if { (eval echo configure:3798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1344 1 a1344 1 -@@@@ -3623,7 +3828,7 @@@@ d1349 1 a1349 1 -+echo "configure:3832: checking whether to use purify" >&5 d1353 1 a1353 1 -@@@@ -3640,7 +3845,7 @@@@ d1358 1 a1358 1 -+echo "configure:3849: checking for $ac_word" >&5 d1362 1 a1362 1 -@@@@ -3717,12 +3922,12 @@@@ d1367 1 a1367 1 -+echo "configure:3926: checking for Cygwin environment" >&5 d1373 1 a1373 1 -+#line 3931 "configure" d1377 1 a1377 1 -@@@@ -3733,7 +3938,7 @@@@ d1382 1 a1382 1 -+if { (eval echo configure:3942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d1386 1 a1386 1 -@@@@ -3750,19 +3955,19 @@@@ d1391 1 a1391 1 -+echo "configure:3959: checking for mingw32 environment" >&5 d1397 1 a1397 1 -+#line 3964 "configure" d1405 1 a1405 1 -+if { (eval echo configure:3971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d1409 1 a1409 1 -@@@@ -3848,7 +4053,7 @@@@ d1414 1 a1414 1 -+echo "configure:4057: checking build system type" >&5 d1418 1 a1418 1 -@@@@ -3877,7 +4082,7 @@@@ d1423 1 a1423 1 -+echo "configure:4086: checking for ld used by GCC" >&5 d1427 1 a1427 1 -@@@@ -3907,10 +4112,10 @@@@ d1432 1 a1432 1 -+echo "configure:4116: checking for GNU ld" >&5 d1436 1 a1436 1 -+echo "configure:4119: checking for non-GNU ld" >&5 d1440 1 a1440 1 -@@@@ -3945,7 +4150,7 @@@@ d1445 1 a1445 1 -+echo "configure:4154: checking if the linker ($LD) is GNU ld" >&5 d1449 1 a1449 1 -@@@@ -3962,7 +4167,7 @@@@ d1454 1 a1454 1 -+echo "configure:4171: checking for $LD option to reload object files" >&5 d1458 1 a1458 1 -@@@@ -3974,7 +4179,7 @@@@ d1463 1 a1463 1 -+echo "configure:4183: checking for BSD-compatible nm" >&5 d1467 1 a1467 1 -@@@@ -4012,7 +4217,7 @@@@ d1472 1 a1472 1 -+echo "configure:4221: checking whether ln -s works" >&5 d1476 1 a1476 1 -@@@@ -4033,7 +4238,7 @@@@ d1481 1 a1481 1 -+echo "configure:4242: checking how to recognise dependant libraries" >&5 d1485 1 a1485 1 -@@@@ -4206,13 +4411,13 @@@@ d1490 1 a1490 1 -+echo "configure:4415: checking for object suffix" >&5 d1497 1 a1497 1 -+if { (eval echo configure:4421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d1501 1 a1501 1 -@@@@ -4232,7 +4437,7 @@@@ d1506 1 a1506 1 -+echo "configure:4441: checking for executable suffix" >&5 d1510 1 a1510 1 -@@@@ -4242,7 +4447,7 @@@@ d1515 1 a1515 1 -+ if { (eval echo configure:4451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then d1519 1 a1519 1 -@@@@ -4273,7 +4478,7 @@@@ d1524 1 a1524 1 -+echo "configure:4482: checking command to parse $NM output" >&5 d1528 1 a1528 1 -@@@@ -4349,10 +4554,10 @@@@ d1533 1 a1533 1 -+ if { (eval echo configure:4558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d1537 1 a1537 1 -+ if { (eval echo configure:4561: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then d1541 1 a1541 1 -@@@@ -4403,7 +4608,7 @@@@ d1546 1 a1546 1 -+ if { (eval echo configure:4612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then d1550 1 a1550 1 -@@@@ -4449,17 +4654,17 @@@@ d1555 1 a1555 1 -+echo "configure:4658: checking for $ac_hdr" >&5 d1561 1 a1561 1 -+#line 4663 "configure" d1567 1 a1567 1 -+{ (eval echo configure:4668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } d1571 1 a1571 1 -@@@@ -4494,7 +4699,7 @@@@ d1576 1 a1576 1 -+echo "configure:4703: checking for ${ac_tool_prefix}file" >&5 d1580 1 a1580 1 -@@@@ -4556,7 +4761,7 @@@@ d1585 1 a1585 1 -+echo "configure:4765: checking for file" >&5 d1589 1 a1589 1 -@@@@ -4627,7 +4832,7 @@@@ d1594 1 a1594 1 -+echo "configure:4836: checking for $ac_word" >&5 d1598 1 a1598 1 -@@@@ -4659,7 +4864,7 @@@@ d1603 1 a1603 1 -+echo "configure:4868: checking for $ac_word" >&5 d1607 1 a1607 1 -@@@@ -4694,7 +4899,7 @@@@ d1612 1 a1612 1 -+echo "configure:4903: checking for $ac_word" >&5 d1616 1 a1616 1 -@@@@ -4726,7 +4931,7 @@@@ d1621 1 a1621 1 -+echo "configure:4935: checking for $ac_word" >&5 d1625 1 a1625 1 -@@@@ -4775,8 +4980,8 @@@@ d1631 2 a1632 2 -+ echo '#line 4984 "configure"' > conftest.$ac_ext -+ if { (eval echo configure:4985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d1636 1 a1636 1 -@@@@ -4797,7 +5002,7 @@@@ d1641 1 a1641 1 -+echo "configure:5006: checking whether the C compiler needs -belf" >&5 d1645 1 a1645 1 -@@@@ -4810,14 +5015,14 @@@@ d1650 1 a1650 1 -+#line 5019 "configure" d1658 1 a1658 1 -+if { (eval echo configure:5026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1662 1 a1662 1 -@@@@ -4932,7 +5137,7 @@@@ d1667 1 a1667 1 -+echo "configure:5141: checking for objdir" >&5 d1671 1 a1671 1 -@@@@ -4963,7 +5168,7 @@@@ d1676 1 a1676 1 -+echo "configure:5172: checking for $compiler option to produce PIC" >&5 d1680 1 a1680 1 -@@@@ -5115,21 +5320,21 @@@@ d1685 1 a1685 1 -+echo "configure:5324: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 d1693 1 a1693 1 -+#line 5331 "configure" d1701 1 a1701 1 -+if { (eval echo configure:5338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d1705 1 a1705 1 -@@@@ -5185,7 +5390,7 @@@@ d1710 1 a1710 1 -+echo "configure:5394: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 d1714 1 a1714 1 -@@@@ -5193,14 +5398,14 @@@@ d1719 1 a1719 1 -+#line 5402 "configure" d1727 1 a1727 1 -+if { (eval echo configure:5409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1731 1 a1731 1 -@@@@ -5231,7 +5436,7 @@@@ d1736 1 a1736 1 -+echo "configure:5440: checking if $compiler supports -c -o file.$ac_objext" >&5 d1740 1 a1740 1 -@@@@ -5250,7 +5455,7 @@@@ d1745 1 a1745 1 -+if { (eval echo configure:5459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then d1749 1 a1749 1 -@@@@ -5279,7 +5484,7 @@@@ d1754 1 a1754 1 -+echo "configure:5488: checking if $compiler supports -c -o file.lo" >&5 d1758 1 a1758 1 -@@@@ -5288,14 +5493,14 @@@@ d1763 1 a1763 1 -+#line 5497 "configure" d1771 1 a1771 1 -+if { (eval echo configure:5504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d1775 1 a1775 1 -@@@@ -5329,7 +5534,7 @@@@ d1780 1 a1780 1 -+echo "configure:5538: checking if we can lock with hard links" >&5 d1784 1 a1784 1 -@@@@ -5352,20 +5557,20 @@@@ d1789 1 a1789 1 -+echo "configure:5561: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 d1796 1 a1796 1 -+#line 5567 "configure" d1804 1 a1804 1 -+if { (eval echo configure:5574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d1808 1 a1808 1 -@@@@ -5396,7 +5601,7 @@@@ d1813 1 a1813 1 -+echo "configure:5605: checking whether the linker ($LD) supports shared libraries" >&5 d1817 1 a1817 1 -@@@@ -6016,7 +6221,7 @@@@ d1822 1 a1822 1 -+echo "configure:6225: checking how to hardcode library paths into programs" >&5 d1826 1 a1826 1 -@@@@ -6048,7 +6253,7 @@@@ d1831 1 a1831 1 -+echo "configure:6257: checking whether stripping libraries is possible" >&5 d1835 1 a1835 1 -@@@@ -6066,7 +6271,7 @@@@ d1840 1 a1840 1 -+echo "configure:6275: checking dynamic linker characteristics" >&5 d1844 1 a1844 1 -@@@@ -6456,7 +6661,7 @@@@ d1849 1 a1849 1 -+echo "configure:6665: checking if libtool supports shared libraries" >&5 d1853 1 a1853 1 -@@@@ -6497,7 +6702,7 @@@@ d1858 1 a1858 1 -+echo "configure:6706: checking for dlopen in -ldl" >&5 d1862 1 a1862 1 -@@@@ -6505,7 +6710,7 @@@@ d1867 1 a1867 1 -+#line 6714 "configure" d1871 1 a1871 1 -@@@@ -6516,7 +6721,7 @@@@ d1876 1 a1876 1 -+if { (eval echo configure:6725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1880 1 a1880 1 -@@@@ -6535,12 +6740,12 @@@@ d1885 1 a1885 1 -+echo "configure:6744: checking for dlopen" >&5 d1891 1 a1891 1 -+#line 6749 "configure" d1895 1 a1895 1 -@@@@ -6563,7 +6768,7 @@@@ d1900 1 a1900 1 -+if { (eval echo configure:6772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1904 1 a1904 1 -@@@@ -6581,12 +6786,12 @@@@ d1909 1 a1909 1 -+echo "configure:6790: checking for shl_load" >&5 d1915 1 a1915 1 -+#line 6795 "configure" d1919 1 a1919 1 -@@@@ -6609,7 +6814,7 @@@@ d1924 1 a1924 1 -+if { (eval echo configure:6818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1928 1 a1928 1 -@@@@ -6627,7 +6832,7 @@@@ d1933 1 a1933 1 -+echo "configure:6836: checking for dlopen in -lsvld" >&5 d1937 1 a1937 1 -@@@@ -6635,7 +6840,7 @@@@ d1942 1 a1942 1 -+#line 6844 "configure" d1946 1 a1946 1 -@@@@ -6646,7 +6851,7 @@@@ d1951 1 a1951 1 -+if { (eval echo configure:6855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1955 1 a1955 1 -@@@@ -6665,7 +6870,7 @@@@ d1960 1 a1960 1 -+echo "configure:6874: checking for shl_load in -ldld" >&5 d1964 1 a1964 1 -@@@@ -6673,7 +6878,7 @@@@ d1969 1 a1969 1 -+#line 6882 "configure" d1973 1 a1973 1 -@@@@ -6684,7 +6889,7 @@@@ d1978 1 a1978 1 -+if { (eval echo configure:6893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1982 1 a1982 1 -@@@@ -6737,7 +6942,7 @@@@ d1987 1 a1987 1 -+echo "configure:6946: checking whether a program can dlopen itself" >&5 d1991 1 a1991 1 -@@@@ -6747,7 +6952,7 @@@@ d1996 1 a1996 1 -+#line 6956 "configure" d2000 1 a2000 1 -@@@@ -6808,7 +7013,7 @@@@ d2005 1 a2005 1 -+ if { (eval echo configure:7017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then d2009 1 a2009 1 -@@@@ -6831,7 +7036,7 @@@@ d2014 1 a2014 1 -+echo "configure:7040: checking whether a statically linked program can dlopen itself" >&5 d2018 1 a2018 1 -@@@@ -6841,7 +7046,7 @@@@ d2023 1 a2023 1 -+#line 7050 "configure" d2027 1 a2027 1 -@@@@ -6902,7 +7107,7 @@@@ d2032 1 a2032 1 -+ if { (eval echo configure:7111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then d2036 1 a2036 1 -@@@@ -6953,14 +7158,14 @@@@ d2041 1 a2041 1 -+echo "configure:7162: checking whether -lc should be explicitly linked in" >&5 d2049 1 a2049 1 -+ if { (eval echo configure:7169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2053 1 a2053 1 -@@@@ -6973,7 +7178,7 @@@@ d2058 1 a2058 1 -+ if { (eval echo configure:7182: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } d2062 1 a2062 1 -@@@@ -7630,9 +7835,9 @@@@ d2067 1 a2067 1 -+echo "configure:7839: checking for IPv6 structures" >&5 d2070 1 a2070 1 -+#line 7841 "configure" d2074 1 a2074 1 -@@@@ -7642,7 +7847,7 @@@@ d2079 1 a2079 1 -+if { (eval echo configure:7851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2083 1 a2083 1 -@@@@ -7660,7 +7865,7 @@@@ d2088 1 a2088 1 -+echo "configure:7869: checking for Kame IPv6 support" >&5 d2092 1 a2092 1 -@@@@ -7751,9 +7956,9 @@@@ d2097 1 a2097 1 -+echo "configure:7960: checking for in6_addr" >&5 d2100 1 a2100 1 -+#line 7962 "configure" d2104 1 a2104 1 -@@@@ -7766,7 +7971,7 @@@@ d2109 1 a2109 1 -+if { (eval echo configure:7975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2113 1 a2113 1 -@@@@ -7784,9 +7989,9 @@@@ d2118 1 a2118 1 -+echo "configure:7993: checking for in6addr_any" >&5 d2121 1 a2121 1 -+#line 7995 "configure" d2125 1 a2125 1 -@@@@ -7800,7 +8005,7 @@@@ d2130 1 a2130 1 -+if { (eval echo configure:8009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2134 1 a2134 1 -@@@@ -7816,9 +8021,9 @@@@ d2139 1 a2139 1 -+echo "configure:8025: checking for in6addr_loopback" >&5 d2142 1 a2142 1 -+#line 8027 "configure" d2146 1 a2146 1 -@@@@ -7832,7 +8037,7 @@@@ d2151 1 a2151 1 -+if { (eval echo configure:8041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2155 1 a2155 1 -@@@@ -7848,9 +8053,9 @@@@ d2160 1 a2160 1 -+echo "configure:8057: checking for sin6_scope_id in struct sockaddr_in6" >&5 d2163 1 a2163 1 -+#line 8059 "configure" d2167 1 a2167 1 -@@@@ -7863,7 +8068,7 @@@@ d2172 1 a2172 1 -+if { (eval echo configure:8072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2176 1 a2176 1 -@@@@ -7878,9 +8083,9 @@@@ d2181 1 a2181 1 -+echo "configure:8087: checking for in6_pktinfo" >&5 d2184 1 a2184 1 -+#line 8089 "configure" d2188 1 a2188 1 -@@@@ -7893,7 +8098,7 @@@@ d2193 1 a2193 1 -+if { (eval echo configure:8102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2197 1 a2197 1 -@@@@ -7948,9 +8153,9 @@@@ d2202 1 a2202 1 -+echo "configure:8157: checking for inet_ntop" >&5 d2205 1 a2205 1 -+#line 8159 "configure" d2209 1 a2209 1 -@@@@ -7960,7 +8165,7 @@@@ d2214 1 a2214 1 -+if { (eval echo configure:8169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2218 1 a2218 1 -@@@@ -7981,13 +8186,13 @@@@ d2223 1 a2223 1 -+echo "configure:8190: checking for inet_pton" >&5 d2230 1 a2230 1 -+#line 8196 "configure" d2234 1 a2234 1 -@@@@ -7997,7 +8202,7 @@@@ d2239 1 a2239 1 -+if { (eval echo configure:8206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d2243 1 a2243 1 -@@@@ -8015,9 +8220,9 @@@@ d2248 1 a2248 1 -+echo "configure:8224: checking for inet_aton" >&5 d2251 1 a2251 1 -+#line 8226 "configure" d2255 1 a2255 1 -@@@@ -8027,7 +8232,7 @@@@ d2260 1 a2260 1 -+if { (eval echo configure:8236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2264 1 a2264 1 -@@@@ -8060,9 +8265,9 @@@@ d2269 1 a2269 1 -+echo "configure:8269: checking for sa_len in struct sockaddr" >&5 d2272 1 a2272 1 -+#line 8271 "configure" d2276 1 a2276 1 -@@@@ -8071,7 +8276,7 @@@@ d2281 1 a2281 1 -+if { (eval echo configure:8280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2285 1 a2285 1 -@@@@ -8092,9 +8297,9 @@@@ d2290 1 a2290 1 -+echo "configure:8301: checking for struct msghdr flavor" >&5 d2293 1 a2293 1 -+#line 8303 "configure" d2297 1 a2297 1 -@@@@ -8103,7 +8308,7 @@@@ d2302 1 a2302 1 -+if { (eval echo configure:8312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2306 1 a2306 1 -@@@@ -8121,9 +8326,9 @@@@ d2311 1 a2311 1 -+echo "configure:8330: checking for type in_port_t" >&5 d2314 1 a2314 1 -+#line 8332 "configure" d2318 1 a2318 1 -@@@@ -8132,7 +8337,7 @@@@ d2323 1 a2323 1 -+if { (eval echo configure:8341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2327 1 a2327 1 -@@@@ -8150,9 +8355,9 @@@@ d2332 1 a2332 1 -+echo "configure:8359: checking for struct addrinfo" >&5 d2335 1 a2335 1 -+#line 8361 "configure" d2339 1 a2339 1 -@@@@ -8160,7 +8365,7 @@@@ d2344 1 a2344 1 -+if { (eval echo configure:8369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2348 1 a2348 1 -@@@@ -8182,9 +8387,9 @@@@ d2353 1 a2353 1 -+echo "configure:8391: checking for struct rrsetinfo" >&5 d2356 1 a2356 1 -+#line 8393 "configure" d2360 1 a2360 1 -@@@@ -8192,7 +8397,7 @@@@ d2365 1 a2365 1 -+if { (eval echo configure:8401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2369 1 a2369 1 -@@@@ -8207,9 +8412,9 @@@@ d2374 1 a2374 1 -+echo "configure:8416: checking for int sethostent" >&5 d2377 1 a2377 1 -+#line 8418 "configure" d2381 1 a2381 1 -@@@@ -8217,7 +8422,7 @@@@ d2386 1 a2386 1 -+if { (eval echo configure:8426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2390 1 a2390 1 -@@@@ -8232,9 +8437,9 @@@@ d2395 1 a2395 1 -+echo "configure:8441: checking for int endhostent" >&5 d2398 1 a2398 1 -+#line 8443 "configure" d2402 1 a2402 1 -@@@@ -8242,7 +8447,7 @@@@ d2407 1 a2407 1 -+if { (eval echo configure:8451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2411 1 a2411 1 -@@@@ -8257,9 +8462,9 @@@@ d2416 1 a2416 1 -+echo "configure:8466: checking for getnetbyaddr(in_addr_t, ...)" >&5 d2419 1 a2419 1 -+#line 8468 "configure" d2423 1 a2423 1 -@@@@ -8268,7 +8473,7 @@@@ d2428 1 a2428 1 -+if { (eval echo configure:8477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2432 1 a2432 1 -@@@@ -8283,9 +8488,9 @@@@ d2437 1 a2437 1 -+echo "configure:8492: checking for int setnetent" >&5 d2440 1 a2440 1 -+#line 8494 "configure" d2444 1 a2444 1 -@@@@ -8293,7 +8498,7 @@@@ d2449 1 a2449 1 -+if { (eval echo configure:8502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2453 1 a2453 1 -@@@@ -8308,9 +8513,9 @@@@ d2458 1 a2458 1 -+echo "configure:8517: checking for int endnetent" >&5 d2461 1 a2461 1 -+#line 8519 "configure" d2465 1 a2465 1 -@@@@ -8318,7 +8523,7 @@@@ d2470 1 a2470 1 -+if { (eval echo configure:8527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2474 1 a2474 1 -@@@@ -8333,9 +8538,9 @@@@ d2479 1 a2479 1 -+echo "configure:8542: checking for gethostbyaddr(const void *, size_t, ...)" >&5 d2482 1 a2482 1 -+#line 8544 "configure" d2486 1 a2486 1 -@@@@ -8344,7 +8549,7 @@@@ d2491 1 a2491 1 -+if { (eval echo configure:8553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2495 1 a2495 1 -@@@@ -8359,9 +8564,9 @@@@ d2500 1 a2500 1 -+echo "configure:8568: checking for h_errno in netdb.h" >&5 d2503 1 a2503 1 -+#line 8570 "configure" d2507 1 a2507 1 -@@@@ -8369,7 +8574,7 @@@@ d2512 1 a2512 1 -+if { (eval echo configure:8578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2516 1 a2516 1 -@@@@ -8384,12 +8589,12 @@@@ d2521 1 a2521 1 -+echo "configure:8593: checking for getipnodebyname" >&5 d2527 1 a2527 1 -+#line 8598 "configure" d2531 1 a2531 1 -@@@@ -8412,7 +8617,7 @@@@ d2536 1 a2536 1 -+if { (eval echo configure:8621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2540 1 a2540 1 -@@@@ -8433,12 +8638,12 @@@@ d2545 1 a2545 1 -+echo "configure:8642: checking for getnameinfo" >&5 d2551 1 a2551 1 -+#line 8647 "configure" d2555 1 a2555 1 -@@@@ -8461,7 +8666,7 @@@@ d2560 1 a2560 1 -+if { (eval echo configure:8670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2564 1 a2564 1 -@@@@ -8482,12 +8687,12 @@@@ d2569 1 a2569 1 -+echo "configure:8691: checking for getaddrinfo" >&5 d2575 1 a2575 1 -+#line 8696 "configure" d2579 1 a2579 1 -@@@@ -8510,7 +8715,7 @@@@ d2584 1 a2584 1 -+if { (eval echo configure:8719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2588 1 a2588 1 -@@@@ -8535,12 +8740,12 @@@@ d2593 1 a2593 1 -+echo "configure:8744: checking for gai_strerror" >&5 d2599 1 a2599 1 -+#line 8749 "configure" d2603 1 a2603 1 -@@@@ -8563,7 +8768,7 @@@@ d2608 1 a2608 1 -+if { (eval echo configure:8772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2612 1 a2612 1 -@@@@ -8593,9 +8798,9 @@@@ d2617 1 a2617 1 -+echo "configure:8802: checking for interface list sysctl" >&5 d2620 1 a2620 1 -+#line 8804 "configure" d2624 1 a2624 1 -@@@@ -8632,16 +8837,16 @@@@ d2629 1 a2629 1 -+echo "configure:8841: checking for correctly declared strsep()" >&5 d2632 1 a2632 1 -+#line 8843 "configure" d2640 1 a2640 1 -+if { (eval echo configure:8850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2644 1 a2644 1 -@@@@ -8653,12 +8858,12 @@@@ d2649 1 a2649 1 -+echo "configure:8862: checking for vsnprintf" >&5 d2655 1 a2655 1 -+#line 8867 "configure" d2659 1 a2659 1 -@@@@ -8681,7 +8886,7 @@@@ d2664 1 a2664 1 -+if { (eval echo configure:8890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2668 1 a2668 1 -@@@@ -8706,12 +8911,12 @@@@ d2673 1 a2673 1 -+echo "configure:8915: checking for strerror" >&5 d2679 1 a2679 1 -+#line 8920 "configure" d2683 1 a2683 1 -@@@@ -8734,7 +8939,7 @@@@ d2688 1 a2688 1 -+if { (eval echo configure:8943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2692 1 a2692 1 -@@@@ -8768,17 +8973,17 @@@@ d2697 1 a2697 1 -+echo "configure:8977: checking printf format modifier for 64-bit integers" >&5 d2704 1 a2704 1 -+#line 8983 "configure" d2709 1 a2709 1 -+if { (eval echo configure:8987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d2713 1 a2713 1 -@@@@ -8798,12 +9003,12 @@@@ d2718 1 a2718 1 -+echo "configure:9007: checking for chroot" >&5 d2724 1 a2724 1 -+#line 9012 "configure" d2728 1 a2728 1 -@@@@ -8826,7 +9031,7 @@@@ d2733 1 a2733 1 -+if { (eval echo configure:9035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d2737 1 a2737 1 -@@@@ -8860,17 +9065,17 @@@@ d2742 1 a2742 1 -+echo "configure:9069: checking for $ac_hdr" >&5 d2748 1 a2748 1 -+#line 9074 "configure" d2754 1 a2754 1 -+{ (eval echo configure:9079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } d2758 1 a2758 1 -@@@@ -8904,17 +9109,17 @@@@ d2763 1 a2763 1 -+echo "configure:9113: checking for $ac_hdr" >&5 d2769 1 a2769 1 -+#line 9118 "configure" d2775 1 a2775 1 -+{ (eval echo configure:9123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } d2779 1 a2779 1 -@@@@ -8945,9 +9150,9 @@@@ d2784 1 a2784 1 -+echo "configure:9154: checking for type rlim_t" >&5 d2787 1 a2787 1 -+#line 9156 "configure" d2791 1 a2791 1 -@@@@ -8957,7 +9162,7 @@@@ d2796 1 a2796 1 -+if { (eval echo configure:9166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then d2800 1 a2800 1 -@@@@ -8968,12 +9173,12 @@@@ d2805 1 a2805 1 -+echo "configure:9177: checking type of rlim_cur" >&5 d2811 1 a2811 1 -+#line 9182 "configure" d2815 1 a2815 1 -@@@@ -8981,7 +9186,7 @@@@ d2820 1 a2820 1 -+if { (eval echo configure:9190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d2824 1 a2824 1 -@@@@ -8994,7 +9199,7 @@@@ d2829 1 a2829 1 -+#line 9203 "configure" d2833 1 a2833 1 -@@@@ -9002,7 +9207,7 @@@@ d2838 1 a2838 1 -+if { (eval echo configure:9211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d2842 1 a2842 1 -@@@@ -9015,7 +9220,7 @@@@ d2847 1 a2847 1 -+#line 9224 "configure" d2851 1 a2851 1 -@@@@ -9023,7 +9228,7 @@@@ d2856 1 a2856 1 -+if { (eval echo configure:9232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d2860 1 a2860 1 -@@@@ -9147,7 +9352,7 @@@@ d2865 1 a2865 1 -+echo "configure:9356: checking for $ac_word" >&5 d2869 1 a2869 1 -@@@@ -9194,7 +9399,7 @@@@ d2874 1 a2874 1 -+echo "configure:9403: checking for $ac_word" >&5 d2878 1 a2878 1 -@@@@ -9237,7 +9442,7 @@@@ d2883 1 a2883 1 -+echo "configure:9446: checking for $ac_word" >&5 d2887 1 a2887 1 -@@@@ -9293,7 +9498,7 @@@@ d2892 1 a2892 1 -+echo "configure:9502: checking for catalog" >&5 d2896 1 a2896 1 -@@@@ -9335,7 +9540,7 @@@@ d2901 1 a2901 1 -+echo "configure:9544: checking for html/docbook.dsl" >&5 d2905 1 a2905 1 -@@@@ -9356,7 +9561,7 @@@@ d2910 1 a2910 1 -+echo "configure:9565: checking for print/docbook.dsl" >&5 d2914 1 a2914 1 -@@@@ -9382,7 +9587,7 @@@@ d2919 1 a2919 1 -+echo "configure:9591: checking for docbook/dsssl/modular/dtds/decls/xml.dcl" >&5 d2923 1 a2923 1 -@@@@ -9408,7 +9613,7 @@@@ d2928 1 a2928 1 -+echo "configure:9617: checking for docbook2X/docbook2man-spec.pl" >&5 d2932 9 a2940 1 -@@@@ -9713,6 +9918,15 @@@@ d2950 3 d2959 1 a2959 1 -@@@@ -9828,7 +10042,7 @@@@ d2968 255 a3222 3 diff -Naur bind-9.2.1-orig/configure.in bind-9.2.1/configure.in --- bind-9.2.1-orig/configure.in Tue Dec 4 21:28:36 2001 +++ bind-9.2.1/configure.in Sat Sep 21 17:58:06 2002 d3224 5 a3228 5 +++ configure Wed Mar 5 00:18:28 2003 @@@@ -998,6 +998,14 @@@@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) d3233 2 d3239 5 a3243 4 --with-openssl=PATH Build with OpenSSL yes|no|path. (Required for DNSSEC) --with-randomdev=PATH Specify path for random device @@@@ -4111,6 +4119,201 @@@@ d3247 1 a3247 1 +# d3261 1 a3261 1 +echo "configure:XXXX: checking for Postgres DLZ driver" >&5 d3296 1 a3296 1 + USE_DLZ_POSTGRES='-DDLZ_POSTGRES' d3314 1 a3314 1 +echo "configure:XXXX: checking for MySQL DLZ driver" >&5 d3351 55 a3405 2 + DLZ_MYSQL_LIBS="-L$use_dlz_mysql/lib/mysql -lmysqlclient -lz -lcrypt -lm" + echo "$ac_t""using mysqlQL from $use_dlz_mysql/lib/mysql and $use_dlz_mysql/include/mysql" 1>&6 d3410 1 a3413 1 + d3419 1 a3419 1 +echo "configure:XXXX: checking for file system DLZ driver" >&5 d3443 2 a3444 1 + d3447 1 a3447 1 +# d3450 1 a3450 1 +echo "configure:XXXX: checking for stub DLZ driver" >&5 d3480 1 a3480 1 +echo "configure:XXXX: checking for DLZ" >&5 a3491 4 + + + + d3495 3 a3497 3 @@@@ -4507,10 +4710,6 @@@@ # it as needed) if it is found. # d3499 14 a3512 8 - - - - # # was --with-gssapi specified? # @@@@ -13981,6 +14180,15 @@@@ d3516 12 a3527 9 +s%@@DLZ_POSTGRES_INC@@%$DLZ_POSTGRES_INC%g +s%@@DLZ_POSTGRES_LIBS@@%$DLZ_POSTGRES_LIBS%g +s%@@USE_DLZ_POSTGRES@@%$USE_DLZ_POSTGRES%g +s%@@DLZ_MYSQL_INC@@%$DLZ_MYSQL_INC%g +s%@@DLZ_MYSQL_LIBS@@%$DLZ_MYSQL_LIBS%g +s%@@USE_DLZ_MYSQL@@%$USE_DLZ_MYSQL%g +s%@@USE_DLZ_FILESYSTEM@@%$USE_DLZ_FILESYSTEM%g +s%@@USE_DLZ_STUB@@%$USE_DLZ_STUB%g +s%@@USE_DLZ@@%$USE_DLZ%g @ 1.2 log @Upgrade to BIND 9.2.0. @ text @d1 2923 a2923 17 --- src/lib/isc/eventlib.c.orig Fri Feb 4 08:25:39 2000 +++ src/lib/isc/eventlib.c Wed Mar 7 11:51:38 2001 @@@@ -293,9 +293,15 @@@@ evPrintf(ctx, 4, "pselect(%d, 0x%lx, 0x%lx, 0x%lx, %d.%09ld)\n", ctx->fdMax+1, +#if 0 (u_long)ctx->rdLast.fds_bits[0], (u_long)ctx->wrLast.fds_bits[0], (u_long)ctx->exLast.fds_bits[0], +#else + (u_long)&(ctx->rdLast), + (u_long)&(ctx->wrLast), + (u_long)&(ctx->exLast), +#endif tp ? tp->tv_sec : -1, tp ? tp->tv_nsec : -1); d2925 195 a3119 15 --- src/lib/isc/ev_files.c.orig Thu Oct 7 22:44:04 1999 +++ src/lib/isc/ev_files.c Wed Mar 7 11:53:04 2001 @@@@ -140,9 +140,15 @@@@ evPrintf(ctx, 5, "evSelectFD(fd %d, mask 0x%x): new masks: 0x%lx 0x%lx 0x%lx\n", fd, eventmask, +#if 0 (u_long)ctx->rdNext.fds_bits[0], (u_long)ctx->wrNext.fds_bits[0], (u_long)ctx->exNext.fds_bits[0]); +#else + (u_long)&(ctx->rdNext), + (u_long)&(ctx->wrNext), + (u_long)&(ctx->exNext)); +#endif d3121 5 a3125 15 return (0); } @@@@ -251,9 +257,15 @@@@ evPrintf(ctx, 5, "evDeselectFD(fd %d, mask 0x%x): new masks: 0x%lx 0x%lx 0x%lx\n", del->fd, eventmask, +#if 0 (u_long)ctx->rdNext.fds_bits[0], (u_long)ctx->wrNext.fds_bits[0], (u_long)ctx->exNext.fds_bits[0]); +#else + (u_long)&(ctx->rdNext), + (u_long)&(ctx->wrNext), + (u_long)&(ctx->exNext)); +#endif d3127 23 a3149 2 /* Couldn't free it before now since we were using fields out of it. */ FREE(del); @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Import OpenPKG sources into CVS repository @ text @@