make lib/Atffile and lib/Kyuafile dependent on exportlib being enabled or not

diff --git a/configure b/configure
index 58541bed0b4baf5603d05f1b7d09c9bcc8d15da1..94196329bd263325f8776b47a97487c3d31ac3d6 100755 (executable)
--- a/configure
+++ b/configure
@@ -793,6 +793,8 @@ ISC_PLATFORM_HAVEIPV6
 export_includedir
 export_libdir
 BIND9_CO_RULE
+KYUAEXPORT
+ATFEXPORT
 LIBEXPORT
 LIBTOOL_IN_MAIN
 LIBTOOL_ALLOW_UNDEFINED
@@ -17054,6 +17056,10 @@ case "$enable_exportlib" in
                        as_fn_error $? "exportlib requires GNU make.  Install it or disable the feature." "$LINENO" 5
                fi
                LIBEXPORT=lib/export
+               ATFEXPORT="tp: export"
+               KYUAEXPORT="include('export/Kyuafile')"
+
+
 
                BIND9_CO_RULE="%.$O:  \${srcdir}/%.c"
                ;;
@@ -22048,7 +22054,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keyzone.py bin/python/isc/tests/dnskey_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/check-secure-delegation.pl contrib/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/export/Makefile lib/export/dns/Makefile lib/export/dns/include/Makefile lib/export/dns/include/dns/Makefile lib/export/dns/include/dst/Makefile lib/export/irs/Makefile lib/export/irs/include/Makefile lib/export/irs/include/irs/Makefile lib/export/irs/include/irs/netdb.h lib/export/irs/include/irs/platform.h lib/export/irs/tests/Makefile lib/export/isc/$thread_dir/Makefile lib/export/isc/$thread_dir/include/Makefile lib/export/isc/$thread_dir/include/isc/Makefile lib/export/isc/Makefile lib/export/isc/include/Makefile lib/export/isc/include/isc/Makefile lib/export/isc/nls/Makefile lib/export/isc/unix/Makefile lib/export/isc/unix/include/Makefile lib/export/isc/unix/include/isc/Makefile lib/export/isccfg/Makefile lib/export/isccfg/include/Makefile lib/export/isccfg/include/isccfg/Makefile lib/export/samples/Makefile lib/export/samples/Makefile-postinstall lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/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/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/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile unit/Makefile unit/unittest.sh"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keyzone.py bin/python/isc/tests/dnskey_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/check-secure-delegation.pl contrib/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Atffile lib/Kyuafile lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/export/Makefile lib/export/dns/Makefile lib/export/dns/include/Makefile lib/export/dns/include/dns/Makefile lib/export/dns/include/dst/Makefile lib/export/irs/Makefile lib/export/irs/include/Makefile lib/export/irs/include/irs/Makefile lib/export/irs/include/irs/netdb.h lib/export/irs/include/irs/platform.h lib/export/irs/tests/Makefile lib/export/isc/$thread_dir/Makefile lib/export/isc/$thread_dir/include/Makefile lib/export/isc/$thread_dir/include/isc/Makefile lib/export/isc/Makefile lib/export/isc/include/Makefile lib/export/isc/include/isc/Makefile lib/export/isc/nls/Makefile lib/export/isc/unix/Makefile lib/export/isc/unix/include/Makefile lib/export/isc/unix/include/isc/Makefile lib/export/isccfg/Makefile lib/export/isccfg/include/Makefile lib/export/isccfg/include/isccfg/Makefile lib/export/samples/Makefile lib/export/samples/Makefile-postinstall lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/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/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/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile unit/Makefile unit/unittest.sh"
 
 
 #
@@ -23111,6 +23117,8 @@ do
     "doc/xsl/isc-manpage.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-manpage.xsl" ;;
     "doc/xsl/isc-notes-html.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-notes-html.xsl" ;;
     "isc-config.sh") CONFIG_FILES="$CONFIG_FILES isc-config.sh" ;;
+    "lib/Atffile") CONFIG_FILES="$CONFIG_FILES lib/Atffile" ;;
+    "lib/Kyuafile") CONFIG_FILES="$CONFIG_FILES lib/Kyuafile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "lib/bind9/Makefile") CONFIG_FILES="$CONFIG_FILES lib/bind9/Makefile" ;;
     "lib/bind9/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/bind9/include/Makefile" ;;

diff --git a/configure.in b/configure.in
index 989dcc2f88dbdd0c48ccd5c3b31decfd85ec73c3..66558b2823c3e9c542b025d381bd5570dd969d61 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2103,7 +2103,11 @@ case "$enable_exportlib" in
                        AC_MSG_ERROR([exportlib requires GNU make.  Install it or disable the feature.])
                fi
                LIBEXPORT=lib/export
+               ATFEXPORT="tp: export"
+               KYUAEXPORT="include('export/Kyuafile')"
                AC_SUBST(LIBEXPORT)
+               AC_SUBST(ATFEXPORT)
+               AC_SUBST(KYUAEXPORT)
                BIND9_CO_RULE="%.$O:  \${srcdir}/%.c"
                ;;
        no|*)
@@ -4327,6 +4331,8 @@ AC_CONFIG_FILES([
        doc/xsl/isc-manpage.xsl
        doc/xsl/isc-notes-html.xsl
        isc-config.sh
+       lib/Atffile
+       lib/Kyuafile
        lib/Makefile
        lib/bind9/Makefile
        lib/bind9/include/Makefile

diff --git a/lib/Atffile.in b/lib/Atffile.in
new file mode 100644 (file)
index 0000000..015e08f
--- /dev/null
+++ b/lib/Atffile.in
@@ -0,0 +1,8 @@
+Content-Type: application/X-atf-atffile; version="1"
+
+prop: test-suite = bind9
+
+tp: dns
+tp: isc
+tp: lwres
+@ATFEXPORT@

diff --git a/lib/Kyuafile b/lib/Kyuafile.in
similarity index 88%
rename from lib/Kyuafile
rename to lib/Kyuafile.in
index 014f93ece23bfe1801dd4bdc81a5f1d93560579a..cf42c6fe81a9901e49f045e3cd5acea11deee9cd 100644 (file)
--- a/lib/Kyuafile
+++ b/lib/Kyuafile.in
@@ -4,3 +4,4 @@ test_suite('bind9')
 include('dns/Kyuafile')
 include('isc/Kyuafile')
 include('lwres/Kyuafile')
+@KYUAEXPORT@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index f0fb80b77bd79f81abe0d8f1a02e9ec05fe14806..56410c1eb3cffbe23e8531fb52f010ab432427d7 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -26,6 +26,4 @@ TARGETS =
 @BIND9_MAKE_RULES@
 
 distclean::
-       @echo "making $@ in `pwd`/irs"; \
-       (cd irs; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" $@) || exit 1;
-
+       rm -f Kyuafile Atffile

diff --git a/lib/Atffile b/lib/export/Atffile
similarity index 75%
rename from lib/Atffile
rename to lib/export/Atffile
index 47b9f7520ca767407f56275a06f4a2ad2084f109..6128e9568ce6649269f6ee4f843587ba27d9b584 100644 (file)
--- a/lib/Atffile
+++ b/lib/export/Atffile
@@ -2,6 +2,4 @@ Content-Type: application/X-atf-atffile; version="1"
 
 prop: test-suite = bind9
 
-tp: dns
-tp: isc
-tp: lwres
+tp: irs

diff --git a/lib/export/Kyuafile b/lib/export/Kyuafile
new file mode 100644 (file)
index 0000000..bf2576a
--- /dev/null
+++ b/lib/export/Kyuafile
@@ -0,0 +1,4 @@
+syntax(2)
+test_suite('bind9')
+
+include('irs/Kyuafile')