Commit 6295b44e authored by Evan Hunt's avatar Evan Hunt
Browse files

remove ATF from configure

(cherry picked from commit efe3c038)
(cherry picked from commit 4f3073de)
parent 707f0f3c
......@@ -677,11 +677,8 @@ BIND9_ISCCFG_BUILDINCLUDE
BIND9_ISCCC_BUILDINCLUDE
BIND9_ISC_BUILDINCLUDE
BIND9_TOP_BUILDDIR
UNITTESTS
ATFLIBS
ATFBIN
ATFBUILD
LD_WRAP_TESTS
UNITTESTS
CMOCKA_LIBS
CMOCKA_CFLAGS
LIBIDN2_LIBS
......@@ -974,6 +971,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
......@@ -1074,7 +1072,6 @@ with_iconv
with_idnlib
with_libidn2
with_cmocka
with_atf
with_tuning
enable_querytrace
with_dlopen
......@@ -1141,6 +1138,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
......@@ -1393,6 +1391,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
 
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
......@@ -1530,7 +1537,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
......@@ -1683,6 +1690,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
......@@ -1807,7 +1815,6 @@ Optional Packages:
--with-idnlib=ARG specify libidnkit
--with-libidn2=PATH enable IDN support using GNU libidn2 [yes|no|path]
--with-cmocka=no enable cmocka based tests (default is no)
--with-atf support Automated Test Framework
--with-tuning=ARG Specify server tuning (large or default)
--with-dlopen=ARG support dynamically loadable DLZ drivers
--with-dlz-postgres=PATH
......@@ -23221,6 +23228,7 @@ case $with_cmocka in #(
: ;; #(
yes) :
 
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmocka >= 1.0.0" >&5
$as_echo_n "checking for cmocka >= 1.0.0... " >&6; }
......@@ -23312,7 +23320,9 @@ $as_echo "yes" >&6; }
 
$as_echo "#define HAVE_CMOCKA 1" >>confdefs.h
 
fi ;; #(
fi
UNITTESTS=tests
;; #(
*) :
 
save_CFLAGS="$CFLAGS"
......@@ -23393,6 +23403,7 @@ if test "$ac_res" != no; then :
 
CMOCKA_CFLAGS="-Iwith_cmocka/include"
CMOCKA_LIBS="-L$with_cmocka/lib -lcmocka"
UNITTESTS=tests
 
$as_echo "#define HAVE_CMOCKA 1" >>confdefs.h
 
......@@ -23408,6 +23419,7 @@ esac
 
 
 
#
# Check for -Wl,--wrap= support
#
......@@ -23449,86 +23461,6 @@ rm -f core conftest.err conftest.$ac_objext \
 
LDFLAGS=$save_LDFLAGS
 
#
# Check whether to build Automated Test Framework unit tests
#
# Check whether --with-atf was given.
if test "${with_atf+set}" = set; then :
withval=$with_atf; atf="$withval"
else
atf="no"
fi
if test "yes" = "$atf"; then
atf=`pwd`/unit/atf
ATFBUILD=atf-src
ac_config_commands="$ac_config_commands atf-config"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: building ATF from bind9/unit/atf-src" >&5
$as_echo "building ATF from bind9/unit/atf-src" >&6; }
fi
ATFLIBS=
if test "no" != "$atf"; then
$as_echo "#define ATF_TEST 1" >>confdefs.h
STD_CINCLUDES="$STD_CINCLUDES -I$atf/include"
ATFBIN="$atf/bin"
ATFLIBS="-L$atf/lib -latf-c"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exp in -lm" >&5
$as_echo_n "checking for exp in -lm... " >&6; }
if ${ac_cv_lib_m_exp+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char exp ();
int
main ()
{
return exp ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_m_exp=yes
else
ac_cv_lib_m_exp=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_exp" >&5
$as_echo "$ac_cv_lib_m_exp" >&6; }
if test "x$ac_cv_lib_m_exp" = xyes; then :
libm=yes
else
libm=no
fi
if test "yes" = "$libm"; then
ATFLIBS="$ATFLIBS -lm"
fi
UNITTESTS=tests
fi
for ac_header in locale.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
......@@ -25943,7 +25875,6 @@ fi
 
 
 
atfdir=`pwd`/unit/atf
 
_ACEOF
 
......@@ -25957,7 +25888,6 @@ do
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"make/rules") CONFIG_FILES="$CONFIG_FILES make/rules" ;;
"make/includes") CONFIG_FILES="$CONFIG_FILES make/includes" ;;
"atf-config") CONFIG_COMMANDS="$CONFIG_COMMANDS atf-config" ;;
"contrib/dlz/bin/dlzbdb/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/dlz/bin/dlzbdb/Makefile" ;;
"$DLZ_DRIVER_RULES") CONFIG_FILES="$CONFIG_FILES $DLZ_DRIVER_RULES" ;;
"contrib/dlz/modules/mysql/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/dlz/modules/mysql/Makefile" ;;
......@@ -27231,15 +27161,6 @@ ltmain=$ac_aux_dir/ltmain.sh
chmod +x "$ofile"
 
;;
"atf-config":C) (
mkdir -p unit/atf-src;
cd unit/atf-src;
case "$srcdir" in
/*) ;;
*) srcdir="../../$srcdir";;
esac
${SHELL} "${srcdir}${srcdir:+/unit/atf-src/}./configure" --enable-tools --disable-shared MISSING=: --prefix $atfdir;
) || as_fn_error $? "Failed to configure ATF." "$LINENO" 5 ;;
"chmod":C) chmod a+x isc-config.sh doc/doxygen/doxygen-input-filter ;;
 
esac
......@@ -27375,7 +27296,7 @@ report() {
test "no" = "$use_libtool" || echo " Use GNU libtool (--with-libtool)"
test "yes" = "$want_querytrace" && \
echo " Very verbose query trace logging (--enable-querytrace)"
test "no" = "$atf" || echo " Automated Testing Framework (--with-atf)"
test "no" = "$with_cmocka" || echo " CMocka Unit Testing Framework (--with-cmocka)"
 
echo " Dynamically loadable zone (DLZ) drivers:"
test "no" = "$use_dlz_bdb" || \
......@@ -27433,7 +27354,7 @@ report() {
echo " Very verbose query trace logging (--enable-querytrace)"
 
test "yes" = "$use_libtool" || echo " Use GNU libtool (--with-libtool)"
test "no" = "$atf" && echo " Automated Testing Framework (--with-atf)"
test "no" = "$with_cmocka" && echo " CMocka Unit Testng Framework (--with-cmocka)"
 
test "X$PYTHON" = "X" && echo " Python tools (--with-python)"
test "X$XMLSTATS" = "X" && echo " XML statistics (--with-libxml2)"
......
......@@ -4843,8 +4843,11 @@ AC_ARG_WITH([cmocka],
AS_CASE([$with_cmocka],
[no],[:],
[yes],[PKG_CHECK_MODULES([CMOCKA], [cmocka >= 1.0.0],
[AC_DEFINE([HAVE_CMOCKA], [1], [Use cmocka])])],
[yes],[
PKG_CHECK_MODULES([CMOCKA], [cmocka >= 1.0.0],
[AC_DEFINE([HAVE_CMOCKA], [1], [Use cmocka])])
UNITTESTS=tests
],
[*],[
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
......@@ -4862,12 +4865,14 @@ AS_CASE([$with_cmocka],
[
CMOCKA_CFLAGS="-Iwith_cmocka/include"
CMOCKA_LIBS="-L$with_cmocka/lib -lcmocka"
UNITTESTS=tests
AC_DEFINE([HAVE_CMOCKA], [1], [Use cmocka])
],
[AC_MSG_ERROR([cmocka unit testing framework not found in $with_cmocka path])])
])
AC_SUBST([CMOCKA_CFLAGS])
AC_SUBST([CMOCKA_LIBS])
AC_SUBST(UNITTESTS)
#
# Check for -Wl,--wrap= support
......@@ -4891,46 +4896,6 @@ AC_SUBST([LD_WRAP_TESTS])
LDFLAGS=$save_LDFLAGS
#
# Check whether to build Automated Test Framework unit tests
#
AC_ARG_WITH(atf,
AS_HELP_STRING([--with-atf],[support Automated Test Framework]),
atf="$withval", atf="no")
if test "yes" = "$atf"; then
atf=`pwd`/unit/atf
ATFBUILD=atf-src
AC_SUBST(ATFBUILD)
AC_CONFIG_COMMANDS([atf-config],
[(
mkdir -p unit/atf-src;
cd unit/atf-src;
case "$srcdir" in
/*) ;;
*) srcdir="../../$srcdir";;
esac
${SHELL} "${srcdir}${srcdir:+/unit/atf-src/}./configure" --enable-tools --disable-shared MISSING=: --prefix $atfdir;
) || AC_MSG_ERROR([Failed to configure ATF.]) ],
[atfdir=`pwd`/unit/atf])
AC_MSG_RESULT(building ATF from bind9/unit/atf-src)
fi
ATFLIBS=
if test "no" != "$atf"; then
AC_DEFINE(ATF_TEST, 1, [define if ATF unit tests are to be built.])
STD_CINCLUDES="$STD_CINCLUDES -I$atf/include"
ATFBIN="$atf/bin"
ATFLIBS="-L$atf/lib -latf-c"
AC_CHECK_LIB(m, exp, libm=yes, libm=no)
if test "yes" = "$libm"; then
ATFLIBS="$ATFLIBS -lm"
fi
UNITTESTS=tests
fi
AC_SUBST(ATFBIN)
AC_SUBST(ATFLIBS)
AC_SUBST(UNITTESTS)
AC_CHECK_HEADERS(locale.h)
AC_CHECK_FUNCS(setlocale)
......@@ -5621,7 +5586,7 @@ report() {
test "no" = "$use_libtool" || echo " Use GNU libtool (--with-libtool)"
test "yes" = "$want_querytrace" && \
echo " Very verbose query trace logging (--enable-querytrace)"
test "no" = "$atf" || echo " Automated Testing Framework (--with-atf)"
test "no" = "$with_cmocka" || echo " CMocka Unit Testing Framework (--with-cmocka)"
echo " Dynamically loadable zone (DLZ) drivers:"
test "no" = "$use_dlz_bdb" || \
......@@ -5679,7 +5644,7 @@ report() {
echo " Very verbose query trace logging (--enable-querytrace)"
test "yes" = "$use_libtool" || echo " Use GNU libtool (--with-libtool)"
test "no" = "$atf" && echo " Automated Testing Framework (--with-atf)"
test "no" = "$with_cmocka" && echo " CMocka Unit Testng Framework (--with-cmocka)"
test "X$PYTHON" = "X" && echo " Python tools (--with-python)"
test "X$XMLSTATS" = "X" && echo " XML statistics (--with-libxml2)"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment