From: Mark Andrews Date: Wed, 13 Jun 2018 04:32:13 +0000 (+1000) Subject: make lib/Atffile and lib/Kyuafile dependent on exportlib being enabled or not X-Git-Tag: v9.9.13rc2~11^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5260f416fd73bc82d02e945b5c5d68711b5d7e3b;p=thirdparty%2Fbind9.git make lib/Atffile and lib/Kyuafile dependent on exportlib being enabled or not --- diff --git a/configure b/configure index 58541bed0b4..94196329bd2 100755 --- 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 989dcc2f88d..66558b2823c 100644 --- 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 index 00000000000..015e08f188a --- /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 014f93ece23..cf42c6fe81a 100644 --- 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 f0fb80b77bd..56410c1eb3c 100644 --- 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 47b9f7520ca..6128e9568ce 100644 --- 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 index 00000000000..bf2576add9b --- /dev/null +++ b/lib/export/Kyuafile @@ -0,0 +1,4 @@ +syntax(2) +test_suite('bind9') + +include('irs/Kyuafile')