diff options
author | Thomas Markwalder <tmark@isc.org> | 2019-11-26 14:22:00 -0500 |
---|---|---|
committer | Thomas Markwalder <tmark@isc.org> | 2019-11-26 14:22:00 -0500 |
commit | 4adcee93c75362d9ed01fa0ba29252f8dfb9409c (patch) | |
tree | 39e767ce15449e8062ad368714f483ee11706c01 /configure | |
parent | e35c2a5242e5af4668ccaf8084a764bd92672bb3 (diff) | |
download | isc-dhcp-4adcee93c75362d9ed01fa0ba29252f8dfb9409c.tar.gz |
[#35,!36] Update ATF use doc and remove support for --with-atf=bind
modified:
RELNOTES
bind/Makefile.in
configure
configure.ac
configure.ac+lt
configure.ac-base
configure.ac-lt
doc/devel/atf.dox
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 30 |
1 files changed, 3 insertions, 27 deletions
@@ -650,12 +650,10 @@ DISTCHECK_ATF_CONFIGURE_FLAG HAVE_ATF_FALSE HAVE_ATF_TRUE UNITTESTS -pkgcfg_found ATF_BIN ATF_LDFLAGS ATF_CFLAGS -BIND_ATF_FALSE -BIND_ATF_TRUE +pkgcfg_found byte_order AR RANLIB @@ -1468,7 +1466,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-atf=PATH specify location where atf was installed (or "bind") + --with-atf=PATH specify location where atf was installed --with-srv-conf-file=PATH Default file containing dhcpd configuration (default is typically /etc/dhcpd.conf) @@ -5598,26 +5596,8 @@ if test "${with_atf+set}" = set; then : withval=$with_atf; atf_path="$withval" fi - if test "$atf_path" = "bind"; then - BIND_ATF_TRUE= - BIND_ATF_FALSE='#' -else - BIND_ATF_TRUE='#' - BIND_ATF_FALSE= -fi - -if test "$atf_path" = "bind" ; then - DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=bind" - atf_pcp="bind" - atf_path="\${top_srcdir}/bind/atf" - ATF_CFLAGS="-I$atf_path/include -DUNIT_TEST" - ATF_LDFLAGS="-L$atf_path/lib -latf-c" - ATF_BIN=`cd $srcdir; pwd`/bind/atf/bin - - - BINDCONFIG="$BINDCONFIG --with-atf" -elif test "$atf_path" != "no" ; then +if test "$atf_path" != "no" ; then DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path" # Config path for pkg-config atf_pcp="" @@ -7689,10 +7669,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BIND_ATF_TRUE}" && test -z "${BIND_ATF_FALSE}"; then - as_fn_error $? "conditional \"BIND_ATF\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${HAVE_ATF_TRUE}" && test -z "${HAVE_ATF_FALSE}"; then as_fn_error $? "conditional \"HAVE_ATF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 |