Merge branch 'v9_6' of ssh://repo/proj/git/prod/bind9 into v9_6

This commit is contained in:
Evan Hunt 2013-01-23 15:49:50 -08:00
commit 309872bb5a

5
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh
# Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1996-2003 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
@ -18568,6 +18568,9 @@ $as_echo "#define ATF_TEST 1" >>confdefs.h
STD_CINCLUDES="$STD_CINCLUDES -I$atf/include"
ATFBIN="$atf/bin"
ATFLIBS="-L$atf/lib -latf-c"
if test "$want_openssl_hash" = yes; then
ATFLIBS="-L$atf/lib -latf-c $DNS_CRYPTO_LIBS"
fi
UNITTESTS=tests
fi