From: Mark Andrews Date: Tue, 12 Jun 2018 05:03:40 +0000 (+1000) Subject: move lib/irs to lib/export/irs X-Git-Tag: v9.9.13rc2~11^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b8ac24be3c4d49c194fe7ce2a96b1820a76ae2c;p=thirdparty%2Fbind9.git move lib/irs to lib/export/irs --- diff --git a/configure b/configure index ba75e0125e6..58541bed0b4 100755 --- a/configure +++ b/configure @@ -18484,12 +18484,14 @@ else /* end confdefs.h. */ #include + +int main() { size_t j = 0; char buf[100]; buf[0] = 0; sprintf(buf, "%zu", j); - exit(strcmp(buf, "0") != 0); + return ((buf[0] == '0' && buf[1] == '\0') ? 0 : 1); } _ACEOF @@ -20869,7 +20871,7 @@ LIBBIND9_API="$srcdir/lib/bind9/api" LIBLWRES_API="$srcdir/lib/lwres/api" -LIBIRS_API="$srcdir/lib/irs/api" +LIBIRS_API="$srcdir/lib/export/irs/api" # # Configure any DLZ drivers. @@ -22046,7 +22048,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/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/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile 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/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" # @@ -23126,6 +23128,9 @@ do "lib/export/irs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/export/irs/Makefile" ;; "lib/export/irs/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/export/irs/include/Makefile" ;; "lib/export/irs/include/irs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/export/irs/include/irs/Makefile" ;; + "lib/export/irs/include/irs/netdb.h") CONFIG_FILES="$CONFIG_FILES lib/export/irs/include/irs/netdb.h" ;; + "lib/export/irs/include/irs/platform.h") CONFIG_FILES="$CONFIG_FILES lib/export/irs/include/irs/platform.h" ;; + "lib/export/irs/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/export/irs/tests/Makefile" ;; "lib/export/isc/$thread_dir/Makefile") CONFIG_FILES="$CONFIG_FILES lib/export/isc/$thread_dir/Makefile" ;; "lib/export/isc/$thread_dir/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/export/isc/$thread_dir/include/Makefile" ;; "lib/export/isc/$thread_dir/include/isc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/export/isc/$thread_dir/include/isc/Makefile" ;; @@ -23141,12 +23146,6 @@ do "lib/export/isccfg/include/isccfg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/export/isccfg/include/isccfg/Makefile" ;; "lib/export/samples/Makefile") CONFIG_FILES="$CONFIG_FILES lib/export/samples/Makefile" ;; "lib/export/samples/Makefile-postinstall") CONFIG_FILES="$CONFIG_FILES lib/export/samples/Makefile-postinstall" ;; - "lib/irs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/irs/Makefile" ;; - "lib/irs/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/irs/include/Makefile" ;; - "lib/irs/include/irs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/irs/include/irs/Makefile" ;; - "lib/irs/include/irs/netdb.h") CONFIG_FILES="$CONFIG_FILES lib/irs/include/irs/netdb.h" ;; - "lib/irs/include/irs/platform.h") CONFIG_FILES="$CONFIG_FILES lib/irs/include/irs/platform.h" ;; - "lib/irs/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/irs/tests/Makefile" ;; "lib/isc/$arch/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/$arch/Makefile" ;; "lib/isc/$arch/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/$arch/include/Makefile" ;; "lib/isc/$arch/include/isc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/$arch/include/isc/Makefile" ;; diff --git a/configure.in b/configure.in index 0943ebb98de..989dcc2f88d 100644 --- a/configure.in +++ b/configure.in @@ -3987,7 +3987,7 @@ AC_SUBST_FILE(LIBLWRES_API) LIBLWRES_API="$srcdir/lib/lwres/api" AC_SUBST_FILE(LIBIRS_API) -LIBIRS_API="$srcdir/lib/irs/api" +LIBIRS_API="$srcdir/lib/export/irs/api" # # Configure any DLZ drivers. @@ -4344,6 +4344,9 @@ AC_CONFIG_FILES([ 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 @@ -4359,12 +4362,6 @@ AC_CONFIG_FILES([ lib/export/isccfg/include/isccfg/Makefile lib/export/samples/Makefile lib/export/samples/Makefile-postinstall - lib/irs/Makefile - lib/irs/include/Makefile - lib/irs/include/irs/Makefile - lib/irs/include/irs/netdb.h - lib/irs/include/irs/platform.h - lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile diff --git a/lib/irs/Atffile b/lib/export/irs/Atffile similarity index 100% rename from lib/irs/Atffile rename to lib/export/irs/Atffile diff --git a/lib/irs/Kyuafile b/lib/export/irs/Kyuafile similarity index 100% rename from lib/irs/Kyuafile rename to lib/export/irs/Kyuafile diff --git a/lib/export/irs/Makefile.in b/lib/export/irs/Makefile.in index 2a9bc0203b6..630387c9489 100644 --- a/lib/export/irs/Makefile.in +++ b/lib/export/irs/Makefile.in @@ -13,7 +13,8 @@ # PERFORMANCE OF THIS SOFTWARE. top_srcdir = @top_srcdir@ -srcdir = @top_srcdir@/lib/irs +srcdir = @srcdir@ +VPATH = @srcdir@ export_srcdir = @top_srcdir@/lib/export VERSION=@BIND9_VERSION@ @@ -49,6 +50,7 @@ LIBS = @LIBS@ SUBDIRS = include TARGETS = timestamp +TESTDIRS = @UNITTESTS@ @BIND9_MAKE_RULES@ diff --git a/lib/irs/api b/lib/export/irs/api similarity index 100% rename from lib/irs/api rename to lib/export/irs/api diff --git a/lib/irs/context.c b/lib/export/irs/context.c similarity index 99% rename from lib/irs/context.c rename to lib/export/irs/context.c index 86950fcddd8..ba0d6a8deb3 100644 --- a/lib/irs/context.c +++ b/lib/export/irs/context.c @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: context.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ - #include #include diff --git a/lib/irs/dnsconf.c b/lib/export/irs/dnsconf.c similarity index 99% rename from lib/irs/dnsconf.c rename to lib/export/irs/dnsconf.c index ecb527d73f7..8e0b67ac067 100644 --- a/lib/irs/dnsconf.c +++ b/lib/export/irs/dnsconf.c @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnsconf.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ - /*! \file */ #include diff --git a/lib/irs/gai_strerror.c b/lib/export/irs/gai_strerror.c similarity index 98% rename from lib/irs/gai_strerror.c rename to lib/export/irs/gai_strerror.c index 0afe1ab2e20..88b3e54bf20 100644 --- a/lib/irs/gai_strerror.c +++ b/lib/export/irs/gai_strerror.c @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: gai_strerror.c,v 1.5 2009/09/02 23:48:02 tbox Exp $ */ - /*! \file gai_strerror.c * gai_strerror() returns an error message corresponding to an * error code returned by getaddrinfo() and getnameinfo(). The following error diff --git a/lib/irs/getaddrinfo.c b/lib/export/irs/getaddrinfo.c similarity index 99% rename from lib/irs/getaddrinfo.c rename to lib/export/irs/getaddrinfo.c index 8955524ee27..ad340b0dc43 100644 --- a/lib/irs/getaddrinfo.c +++ b/lib/export/irs/getaddrinfo.c @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: getaddrinfo.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ - /*! \file */ /** diff --git a/lib/irs/getnameinfo.c b/lib/export/irs/getnameinfo.c similarity index 100% rename from lib/irs/getnameinfo.c rename to lib/export/irs/getnameinfo.c diff --git a/lib/export/irs/include/Makefile.in b/lib/export/irs/include/Makefile.in index 7311eb3894d..2a549d297f8 100644 --- a/lib/export/irs/include/Makefile.in +++ b/lib/export/irs/include/Makefile.in @@ -12,12 +12,10 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id$ - srcdir = @srcdir@ +VPATH = @srcdir@ top_srcdir = @top_srcdir@ - SUBDIRS = irs TARGETS = diff --git a/lib/irs/include/irs/context.h b/lib/export/irs/include/irs/context.h similarity index 98% rename from lib/irs/include/irs/context.h rename to lib/export/irs/include/irs/context.h index 7a61359ac3a..8bf85be87a9 100644 --- a/lib/irs/include/irs/context.h +++ b/lib/export/irs/include/irs/context.h @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: context.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ - #ifndef IRS_CONTEXT_H #define IRS_CONTEXT_H 1 diff --git a/lib/irs/include/irs/dnsconf.h b/lib/export/irs/include/irs/dnsconf.h similarity index 97% rename from lib/irs/include/irs/dnsconf.h rename to lib/export/irs/include/irs/dnsconf.h index 001dc312d1b..f0b507a1b07 100644 --- a/lib/irs/include/irs/dnsconf.h +++ b/lib/export/irs/include/irs/dnsconf.h @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnsconf.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ - #ifndef IRS_DNSCONF_H #define IRS_DNSCONF_H 1 diff --git a/lib/irs/include/irs/netdb.h.in b/lib/export/irs/include/irs/netdb.h.in similarity index 98% rename from lib/irs/include/irs/netdb.h.in rename to lib/export/irs/include/irs/netdb.h.in index 08cb0a38090..994008c413d 100644 --- a/lib/irs/include/irs/netdb.h.in +++ b/lib/export/irs/include/irs/netdb.h.in @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: netdb.h.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ - /*! \file */ #ifndef IRS_NETDB_H diff --git a/lib/irs/include/irs/platform.h.in b/lib/export/irs/include/irs/platform.h.in similarity index 95% rename from lib/irs/include/irs/platform.h.in rename to lib/export/irs/include/irs/platform.h.in index 656c949bb04..968736845b5 100644 --- a/lib/irs/include/irs/platform.h.in +++ b/lib/export/irs/include/irs/platform.h.in @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: platform.h.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ - /*! \file */ #ifndef IRS_PLATFORM_H diff --git a/lib/irs/include/irs/resconf.h b/lib/export/irs/include/irs/resconf.h similarity index 98% rename from lib/irs/include/irs/resconf.h rename to lib/export/irs/include/irs/resconf.h index f5e450c23da..6305039fb6d 100644 --- a/lib/irs/include/irs/resconf.h +++ b/lib/export/irs/include/irs/resconf.h @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resconf.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ - #ifndef IRS_RESCONF_H #define IRS_RESCONF_H 1 diff --git a/lib/irs/include/irs/types.h b/lib/export/irs/include/irs/types.h similarity index 95% rename from lib/irs/include/irs/types.h rename to lib/export/irs/include/irs/types.h index 4e31995bfe6..ff163c944b5 100644 --- a/lib/irs/include/irs/types.h +++ b/lib/export/irs/include/irs/types.h @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: types.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ - #ifndef IRS_TYPES_H #define IRS_TYPES_H 1 diff --git a/lib/irs/include/irs/version.h b/lib/export/irs/include/irs/version.h similarity index 94% rename from lib/irs/include/irs/version.h rename to lib/export/irs/include/irs/version.h index f4e0bec9e26..0999c1456db 100644 --- a/lib/irs/include/irs/version.h +++ b/lib/export/irs/include/irs/version.h @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: version.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ - /*! \file */ #include diff --git a/lib/irs/resconf.c b/lib/export/irs/resconf.c similarity index 100% rename from lib/irs/resconf.c rename to lib/export/irs/resconf.c diff --git a/lib/irs/tests/Atffile b/lib/export/irs/tests/Atffile similarity index 100% rename from lib/irs/tests/Atffile rename to lib/export/irs/tests/Atffile diff --git a/lib/irs/tests/Kyuafile b/lib/export/irs/tests/Kyuafile similarity index 100% rename from lib/irs/tests/Kyuafile rename to lib/export/irs/tests/Kyuafile diff --git a/lib/irs/tests/Makefile.in b/lib/export/irs/tests/Makefile.in similarity index 91% rename from lib/irs/tests/Makefile.in rename to lib/export/irs/tests/Makefile.in index fae8c561766..f70d734025e 100644 --- a/lib/irs/tests/Makefile.in +++ b/lib/export/irs/tests/Makefile.in @@ -24,8 +24,9 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = -I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES} -CDEFINES = -DTESTS="\"${top_builddir}/lib/irs/tests/\"" +CINCLUDES = -I. -Iinclude -I../include -I../../isc/include \ + ${ISC_INCLUDES} ${IRS_INCLUDES} +CDEFINES = -DTESTS="\"${top_builddir}/lib/export/irs/tests/\"" CFGLIBS = ../../isccfg/libisccfg.@A@ CFGDEPLIBS = ../../isccfg/libisccfg.@A@ diff --git a/lib/irs/tests/resconf_test.c b/lib/export/irs/tests/resconf_test.c similarity index 98% rename from lib/irs/tests/resconf_test.c rename to lib/export/irs/tests/resconf_test.c index f6f9e855c47..706747e97ab 100644 --- a/lib/irs/tests/resconf_test.c +++ b/lib/export/irs/tests/resconf_test.c @@ -23,6 +23,7 @@ #include #include +#include #include #include @@ -35,6 +36,10 @@ static void setup_test() { isc_result_t result; +#ifndef BIND9 + isc_lib_register(); +#endif + result = isc_mem_create(0, 0, &mctx); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); diff --git a/lib/irs/tests/testdata/domain.conf b/lib/export/irs/tests/testdata/domain.conf similarity index 100% rename from lib/irs/tests/testdata/domain.conf rename to lib/export/irs/tests/testdata/domain.conf diff --git a/lib/irs/tests/testdata/nameserver-v4.conf b/lib/export/irs/tests/testdata/nameserver-v4.conf similarity index 100% rename from lib/irs/tests/testdata/nameserver-v4.conf rename to lib/export/irs/tests/testdata/nameserver-v4.conf diff --git a/lib/irs/tests/testdata/nameserver-v6.conf b/lib/export/irs/tests/testdata/nameserver-v6.conf similarity index 100% rename from lib/irs/tests/testdata/nameserver-v6.conf rename to lib/export/irs/tests/testdata/nameserver-v6.conf diff --git a/lib/irs/tests/testdata/options-bad-ndots.conf b/lib/export/irs/tests/testdata/options-bad-ndots.conf similarity index 100% rename from lib/irs/tests/testdata/options-bad-ndots.conf rename to lib/export/irs/tests/testdata/options-bad-ndots.conf diff --git a/lib/irs/tests/testdata/options-debug.conf b/lib/export/irs/tests/testdata/options-debug.conf similarity index 100% rename from lib/irs/tests/testdata/options-debug.conf rename to lib/export/irs/tests/testdata/options-debug.conf diff --git a/lib/irs/tests/testdata/options-empty.conf b/lib/export/irs/tests/testdata/options-empty.conf similarity index 100% rename from lib/irs/tests/testdata/options-empty.conf rename to lib/export/irs/tests/testdata/options-empty.conf diff --git a/lib/irs/tests/testdata/options-ndots.conf b/lib/export/irs/tests/testdata/options-ndots.conf similarity index 100% rename from lib/irs/tests/testdata/options-ndots.conf rename to lib/export/irs/tests/testdata/options-ndots.conf diff --git a/lib/irs/tests/testdata/options-timeout.conf b/lib/export/irs/tests/testdata/options-timeout.conf similarity index 100% rename from lib/irs/tests/testdata/options-timeout.conf rename to lib/export/irs/tests/testdata/options-timeout.conf diff --git a/lib/irs/tests/testdata/options-unknown.conf b/lib/export/irs/tests/testdata/options-unknown.conf similarity index 100% rename from lib/irs/tests/testdata/options-unknown.conf rename to lib/export/irs/tests/testdata/options-unknown.conf diff --git a/lib/irs/tests/testdata/options.conf b/lib/export/irs/tests/testdata/options.conf similarity index 100% rename from lib/irs/tests/testdata/options.conf rename to lib/export/irs/tests/testdata/options.conf diff --git a/lib/irs/tests/testdata/port.conf b/lib/export/irs/tests/testdata/port.conf similarity index 100% rename from lib/irs/tests/testdata/port.conf rename to lib/export/irs/tests/testdata/port.conf diff --git a/lib/irs/tests/testdata/resolv.conf b/lib/export/irs/tests/testdata/resolv.conf similarity index 100% rename from lib/irs/tests/testdata/resolv.conf rename to lib/export/irs/tests/testdata/resolv.conf diff --git a/lib/irs/tests/testdata/search.conf b/lib/export/irs/tests/testdata/search.conf similarity index 100% rename from lib/irs/tests/testdata/search.conf rename to lib/export/irs/tests/testdata/search.conf diff --git a/lib/irs/tests/testdata/sortlist-v4.conf b/lib/export/irs/tests/testdata/sortlist-v4.conf similarity index 100% rename from lib/irs/tests/testdata/sortlist-v4.conf rename to lib/export/irs/tests/testdata/sortlist-v4.conf diff --git a/lib/irs/tests/testdata/timeout.conf b/lib/export/irs/tests/testdata/timeout.conf similarity index 100% rename from lib/irs/tests/testdata/timeout.conf rename to lib/export/irs/tests/testdata/timeout.conf diff --git a/lib/irs/tests/testdata/unknown.conf b/lib/export/irs/tests/testdata/unknown.conf similarity index 100% rename from lib/irs/tests/testdata/unknown.conf rename to lib/export/irs/tests/testdata/unknown.conf diff --git a/lib/irs/version.c b/lib/export/irs/version.c similarity index 94% rename from lib/irs/version.c rename to lib/export/irs/version.c index c8f2df01aa6..f203db9f5fe 100644 --- a/lib/irs/version.c +++ b/lib/export/irs/version.c @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: version.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ - /*! \file */ #include diff --git a/lib/export/samples/Makefile.in b/lib/export/samples/Makefile.in index bafcfb0b632..130b8452031 100644 --- a/lib/export/samples/Makefile.in +++ b/lib/export/samples/Makefile.in @@ -12,8 +12,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.4 2009/12/05 23:31:41 each Exp $ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ export_srcdir = @top_srcdir@/lib/export @@ -25,8 +23,8 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I${srcdir}/include -I../dns/include \ -I${export_srcdir}/isc/include \ ${DNS_INCLUDES} ${ISC_INCLUDES} \ - -I${top_srcdir}/lib/irs/include \ - -I../../irs/include + -I${top_srcdir}/lib/export/irs/include \ + -I../../export/irs/include CDEFINES = CWARNINGS = diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in deleted file mode 100644 index 2dd612f9b8d..00000000000 --- a/lib/irs/Makefile.in +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ - -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ - -VERSION=@BIND9_VERSION@ - -@LIBIRS_API@ - -@BIND9_MAKE_INCLUDES@ - -CINCLUDES = -I. -I./include -I${srcdir}/include \ - ${DNS_INCLUDES} ${ISC_INCLUDES} \ - ${ISCCFG_INCLUDES} - -CDEFINES = -CWARNINGS = - -# Alphabetically -OBJS = context.@O@ \ - dnsconf.@O@ \ - gai_strerror.@O@ getaddrinfo.@O@ getnameinfo.@O@ \ - resconf.@O@ - -# Alphabetically -SRCS = context.c \ - dnsconf.c \ - gai_strerror.c getaddrinfo.c getnameinfo.c \ - resconf.c - -LIBS = @LIBS@ - -SUBDIRS = include -TESTDIRS = @UNITTESTS@ -TARGETS = timestamp - -@BIND9_MAKE_RULES@ - -version.@O@: version.c - ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ - -DVERSION=\"${VERSION}\" \ - -DLIBINTERFACE=${LIBINTERFACE} \ - -DLIBREVISION=${LIBREVISION} \ - -DLIBAGE=${LIBAGE} \ - -c ${srcdir}/version.c - -libirs.@SA@: ${OBJS} version.@O@ - ${AR} ${ARFLAGS} $@ ${OBJS} version.@O@ - ${RANLIB} $@ - -libirs.la: ${OBJS} version.@O@ - ${LIBTOOL_MODE_LINK} \ - ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs.la -rpath ${libdir} \ - -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ - ${OBJS} version.@O@ ${LIBS} - -timestamp: libirs.@A@ - touch timestamp - -testdirs: libirs.@A@ - -installdirs: - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} - -install:: timestamp installdirs - ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libirs.@A@ ${DESTDIR}${libdir} - -uninstall:: - ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libirs.@A@ - -clean distclean:: - rm -f libirs.@A@ libirs.la timestamp diff --git a/lib/irs/include/Makefile.in b/lib/irs/include/Makefile.in deleted file mode 100644 index 06c36fa656b..00000000000 --- a/lib/irs/include/Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ - -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ - -SUBDIRS = irs -TARGETS = - -@BIND9_MAKE_RULES@ diff --git a/lib/irs/include/irs/Makefile.in b/lib/irs/include/irs/Makefile.in deleted file mode 100644 index 977d8a5a96c..00000000000 --- a/lib/irs/include/irs/Makefile.in +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ - -# -# Only list headers that are to be installed and are not -# machine generated. The latter are handled specially in the -# install target below. -# -HEADERS = context.h dnsconf.h resconf.h types.h version.h - -SUBDIRS = -TARGETS = - -@BIND9_MAKE_RULES@ - -installdirs: - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/irs - -install:: installdirs - for i in ${HEADERS}; do \ - ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/irs ; \ - done - ${INSTALL_DATA} netdb.h ${DESTDIR}${includedir}/irs - ${INSTALL_DATA} platform.h ${DESTDIR}${includedir}/irs - -uninstall:: - rm -f ${DESTDIR}${includedir}/irs/platform.h - rm -f ${DESTDIR}${includedir}/irs/netdb.h - for i in ${HEADERS}; do \ - rm -f ${DESTDIR}${includedir}/irs/$$i ; \ - done - -distclean:: - rm -f netdb.h platform.h