From 51917258dbb23cfe6069ae1cf2b7fc5aefc1e0c2 Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Tue, 5 Oct 1999 19:52:30 +0000 Subject: [PATCH] build system cleanups; improved include handling --- bin/named/Makefile.in | 12 +-- bin/tests/Makefile.in | 10 +-- bin/tests/db/Makefile.in | 10 +-- bin/tests/dst/Makefile.in | 10 +-- bin/tests/master/Makefile.in | 9 +- bin/tests/mem/Makefile.in | 9 +- bin/tests/names/Makefile.in | 9 +- bin/tests/rbt/Makefile.in | 9 +- bin/tests/tasks/Makefile.in | 9 +- bin/tests/timers/Makefile.in | 9 +- configure | 75 ++++++++++------- configure.in | 67 +++++++++------ lib/dns/Makefile.in | 13 +-- lib/dns/config/Makefile.in | 11 +-- lib/dns/sec/dnssafe/Makefile.in | 13 +-- lib/dns/sec/dst/Makefile.in | 16 +--- lib/dns/sec/openssl/Makefile.in | 13 +-- lib/isc/Makefile.in | 4 +- lib/isc/include/isc/.cvsignore | 2 +- lib/isc/include/isc/Makefile.in | 7 +- lib/isc/include/isc/platform.h.in | 86 ++++++++++++++++++++ lib/isc/include/isc/{print.h.in => print.h} | 15 +--- lib/isc/nls/Makefile.in | 5 +- lib/isc/pthreads/Makefile.in | 5 +- lib/isc/unix/Makefile.in | 9 +- lib/isc/unix/include/isc/.cvsignore | 1 - lib/isc/unix/include/isc/Makefile.in | 3 - lib/isc/unix/include/isc/{net.h.in => net.h} | 60 +++----------- make/.cvsignore | 1 + make/includes.in | 12 +++ 30 files changed, 260 insertions(+), 254 deletions(-) create mode 100644 lib/isc/include/isc/platform.h.in rename lib/isc/include/isc/{print.h.in => print.h} (88%) rename lib/isc/unix/include/isc/{net.h.in => net.h} (75%) create mode 100644 make/includes.in diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index 7bdab94c8f..448b6ecf83 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -19,15 +19,9 @@ top_srcdir = @top_srcdir@ @BIND9_VERSION@ -CINCLUDES = -I../../lib/isc/unix/include \ - -I${srcdir}/../../lib/isc/unix/include \ - -I${srcdir}/../../lib/isc/pthreads/include \ - -I${srcdir}/../../lib/isc/include \ - -I../../lib/dns/include \ - -I${srcdir}/../../lib/dns/include \ - -I${srcdir}/../../lib/dns/sec/dst/include \ - -I${srcdir}/include \ - -I${srcdir}/../.. +@BIND9_INCLUDES@ + +CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in index 7c9e0b447a..04bcfe7792 100644 --- a/bin/tests/Makefile.in +++ b/bin/tests/Makefile.in @@ -17,13 +17,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -CINCLUDES = -I../../lib/isc/unix/include \ - -I${srcdir}/../../lib/isc/unix/include \ - -I${srcdir}/../../lib/isc/pthreads/include \ - -I${srcdir}/../../lib/isc/include \ - -I../../lib/dns/include \ - -I${srcdir}/../../lib/dns/include \ - -I${srcdir}/../../lib/dns/sec/dst/include +@BIND9_INCLUDES@ + +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in index 223f8b3097..bd68cc8b8d 100644 --- a/bin/tests/db/Makefile.in +++ b/bin/tests/db/Makefile.in @@ -17,13 +17,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -CINCLUDES = -I${srcdir}/../../../lib/isc/unix/include \ - -I../../../lib/isc/unix/include \ - -I${srcdir}/../../../lib/isc/pthreads/include \ - -I${srcdir}/../../../lib/isc/include \ - -I${srcdir}/../../../lib/dns/include \ - -I../../../lib/dns/include \ - -I${srcdir}/../../../lib/tests/include +@BIND9_INCLUDES@ + +CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in index 675b5d55d1..3e6f35964a 100644 --- a/bin/tests/dst/Makefile.in +++ b/bin/tests/dst/Makefile.in @@ -17,13 +17,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -CINCLUDES = -I${srcdir}/../../../lib/isc/unix/include \ - -I${srcdir}/../../../lib/isc/pthreads/include \ - -I${srcdir}/../../../lib/isc/include \ - -I${srcdir}/../../../lib/dns/include \ - -I../../../lib/dns/include \ - -I${srcdir}/../../../lib/dns/sec/dst/include \ - -I${srcdir}/../../../lib/tests/include +@BIND9_INCLUDES@ + +CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in index 07a06c8965..bbc29f4f45 100644 --- a/bin/tests/master/Makefile.in +++ b/bin/tests/master/Makefile.in @@ -17,12 +17,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -CINCLUDES = -I${srcdir}/../../../lib/isc/unix/include \ - -I${srcdir}/../../../lib/isc/pthreads/include \ - -I${srcdir}/../../../lib/isc/include \ - -I${srcdir}/../../../lib/dns/include \ - -I${srcdir}/../../../lib/tests/include \ - -I../../../lib/dns/include +@BIND9_INCLUDES@ + +CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/bin/tests/mem/Makefile.in b/bin/tests/mem/Makefile.in index 2e1da15244..289b2aae34 100644 --- a/bin/tests/mem/Makefile.in +++ b/bin/tests/mem/Makefile.in @@ -17,12 +17,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -CINCLUDES = -I${srcdir}/../../../lib/isc/unix/include \ - -I${srcdir}/../../../lib/isc/pthreads/include \ - -I${srcdir}/../../../lib/isc/include \ - -I${srcdir}/../../../lib/dns/include \ - -I../../../lib/dns/include \ - -I${srcdir}/../../../lib/tests/include +@BIND9_INCLUDES@ + +CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in index 2ea215b242..56f26cc606 100644 --- a/bin/tests/names/Makefile.in +++ b/bin/tests/names/Makefile.in @@ -17,12 +17,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -CINCLUDES = -I${srcdir}/../../../lib/isc/unix/include \ - -I${srcdir}/../../../lib/isc/pthreads/include \ - -I${srcdir}/../../../lib/isc/include \ - -I${srcdir}/../../../lib/dns/include \ - -I${srcdir}/../../../lib/tests/include \ - -I../../../lib/dns/include +@BIND9_INCLUDES@ + +CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in index c04a6116ba..ed408ef9f4 100644 --- a/bin/tests/rbt/Makefile.in +++ b/bin/tests/rbt/Makefile.in @@ -17,12 +17,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -CINCLUDES = -I${srcdir}/../../../lib/isc/unix/include \ - -I${srcdir}/../../../lib/isc/pthreads/include \ - -I${srcdir}/../../../lib/isc/include \ - -I${srcdir}/../../../lib/dns/include \ - -I../../../lib/dns/include \ - -I${srcdir}/../../../lib/tests/include +@BIND9_INCLUDES@ + +CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/bin/tests/tasks/Makefile.in b/bin/tests/tasks/Makefile.in index 41b675aa63..930002f8bd 100644 --- a/bin/tests/tasks/Makefile.in +++ b/bin/tests/tasks/Makefile.in @@ -17,12 +17,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -CINCLUDES = -I${srcdir}/../../../lib/isc/unix/include \ - -I${srcdir}/../../../lib/isc/pthreads/include \ - -I${srcdir}/../../../lib/isc/include \ - -I${srcdir}/../../../lib/dns/include \ - -I../../../lib/dns/include \ - -I${srcdir}/../../../lib/tests/include +@BIND9_INCLUDES@ + +CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/bin/tests/timers/Makefile.in b/bin/tests/timers/Makefile.in index 76aba6f415..237dffcc67 100644 --- a/bin/tests/timers/Makefile.in +++ b/bin/tests/timers/Makefile.in @@ -17,12 +17,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -CINCLUDES = -I${srcdir}/../../../lib/isc/unix/include \ - -I${srcdir}/../../../lib/isc/pthreads/include \ - -I${srcdir}/../../../lib/isc/include \ - -I${srcdir}/../../../lib/dns/include \ - -I../../../lib/dns/include \ - -I${srcdir}/../../../lib/tests/include +@BIND9_INCLUDES@ + +CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/configure b/configure index 3205c95ffc..488d721577 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.58 +# From configure.in Revision: 1.60 @@ -2118,13 +2118,13 @@ EOF if { (eval echo configure:2119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 - ISC_NET_HAVESALEN="#define ISC_NET_HAVESALEN 1" + ISC_PLATFORM_HAVESALEN="#define ISC_PLATFORM_HAVESALEN 1" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 - ISC_NET_HAVESALEN="#undef ISC_NET_HAVESALEN" + ISC_PLATFORM_HAVESALEN="#undef ISC_PLATFORM_HAVESALEN" fi rm -f conftest* @@ -2145,13 +2145,13 @@ EOF if { (eval echo configure:2146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""4.4BSD" 1>&6 - ISC_NET_MSGHDRFLAVOR="#define ISC_NET_BSD44MSGHDR 1" + ISC_PLATFORM_MSGHDRFLAVOR="#define ISC_NET_BSD44MSGHDR 1" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""4.3BSD" 1>&6 - ISC_NET_MSGHDRFLAVOR="#define ISC_NET_BSD43MSGHDR 1" + ISC_PLATFORM_MSGHDRFLAVOR="#define ISC_NET_BSD43MSGHDR 1" fi rm -f conftest* @@ -2170,13 +2170,13 @@ EOF if { (eval echo configure:2171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 - ISC_NET_NEEDPORTT="#undef ISC_NET_NEEDPORTT" + ISC_PLATFORM_NEEDPORTT="#undef ISC_PLATFORM_NEEDPORTT" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 - ISC_NET_NEEDPORTT="#define ISC_NET_NEEDPORTT 1" + ISC_PLATFORM_NEEDPORTT="#define ISC_PLATFORM_NEEDPORTT 1" fi rm -f conftest* @@ -2645,13 +2645,13 @@ EOF if { (eval echo configure:2646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 - ISC_NET_HAVEIPV6="#define ISC_NET_HAVEIPV6 1" + ISC_PLATFORM_HAVEIPV6="#define ISC_PLATFORM_HAVEIPV6 1" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 - ISC_NET_HAVEIPV6="#undef ISC_NET_HAVEIPV6" + ISC_PLATFORM_HAVEIPV6="#undef ISC_PLATFORM_HAVEIPV6" ISC_IPV6_H="ipv6.h" ISC_IPV6_O="ipv6.$O" ISC_ISCIPV6_O="unix/ipv6.$O" @@ -2707,12 +2707,12 @@ fi if eval "test \"`echo '$ac_cv_func_'inet_ntop`\" = yes"; then echo "$ac_t""yes" 1>&6 - ISC_NET_NEEDNTOP="#undef ISC_NET_NEEDNTOP" + ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP" else echo "$ac_t""no" 1>&6 ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c" - ISC_NET_NEEDNTOP="#define ISC_NET_NEEDNTOP 1" + ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1" fi @@ -2759,12 +2759,12 @@ fi if eval "test \"`echo '$ac_cv_func_'inet_pton`\" = yes"; then echo "$ac_t""yes" 1>&6 - ISC_NET_NEEDPTON="#undef ISC_NET_NEEDPTON" + ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON" else echo "$ac_t""no" 1>&6 ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_pton.$O" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_pton.c" - ISC_NET_NEEDPTON="#define ISC_NET_NEEDPTON 1" + ISC_PLATFORM_NEEDPTON="#define ISC_PLATFORM_NEEDPTON 1" fi @@ -2811,12 +2811,12 @@ fi if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then echo "$ac_t""yes" 1>&6 - ISC_NET_NEEDATON="#undef ISC_NET_NEEDATON" + ISC_PLATFORM_NEEDATON="#undef ISC_PLATFORM_NEEDATON" else echo "$ac_t""no" 1>&6 ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_aton.$O" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_aton.c" - ISC_NET_NEEDATON="#define ISC_NET_NEEDATON 1" + ISC_PLATFORM_NEEDATON="#define ISC_PLATFORM_NEEDATON 1" fi @@ -2863,12 +2863,12 @@ fi if eval "test \"`echo '$ac_cv_func_'vsnprintf`\" = yes"; then echo "$ac_t""yes" 1>&6 - ISC_PRINT_NEEDVSNPRINTF="#undef ISC_PRINT_NEEDVSNPRINTF" + ISC_PLATFORM_NEEDVSNPRINTF="#undef ISC_PLATFORM_NEEDVSNPRINTF" else echo "$ac_t""no" 1>&6 ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS print.$O" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS print.c" - ISC_PRINT_NEEDVSNPRINTF="#define ISC_PRINT_NEEDVSNPRINTF 1" + ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1" fi @@ -2882,6 +2882,19 @@ fi BIND9_TOP_BUILDDIR=`pwd` + +if test "X$srcdir" != "X"; then + BIND9_ISC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc/include" + BIND9_DNS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/dns/include" +else + BIND9_ISC_BUILDINCLUDE="" + BIND9_DNS_BUILDINCLUDE="" +fi + + +BIND9_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes + + BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules @@ -2995,6 +3008,7 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "make/rules + make/includes Makefile make/Makefile make/mkdep @@ -3002,11 +3016,10 @@ trap 'rm -fr `echo "make/rules lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile - lib/isc/include/isc/print.h + lib/isc/include/isc/platform.h lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile - lib/isc/unix/include/isc/net.h lib/isc/nls/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile @@ -3090,9 +3103,9 @@ s%@CPP@%$CPP%g s%@MKDEPCC@%$MKDEPCC%g s%@MKDEPCFLAGS@%$MKDEPCFLAGS%g s%@MKDEPPROG@%$MKDEPPROG%g -s%@ISC_NET_HAVESALEN@%$ISC_NET_HAVESALEN%g -s%@ISC_NET_MSGHDRFLAVOR@%$ISC_NET_MSGHDRFLAVOR%g -s%@ISC_NET_NEEDPORTT@%$ISC_NET_NEEDPORTT%g +s%@ISC_PLATFORM_HAVESALEN@%$ISC_PLATFORM_HAVESALEN%g +s%@ISC_PLATFORM_MSGHDRFLAVOR@%$ISC_PLATFORM_MSGHDRFLAVOR%g +s%@ISC_PLATFORM_NEEDPORTT@%$ISC_PLATFORM_NEEDPORTT%g s%@build@%$build%g s%@build_alias@%$build_alias%g s%@build_cpu@%$build_cpu%g @@ -3104,18 +3117,22 @@ s%@LN_S@%$LN_S%g s%@LIBTOOL@%$LIBTOOL%g s%@O@%$O%g s%@A@%$A%g -s%@ISC_NET_HAVEIPV6@%$ISC_NET_HAVEIPV6%g +s%@ISC_PLATFORM_HAVEIPV6@%$ISC_PLATFORM_HAVEIPV6%g s%@ISC_IPV6_H@%$ISC_IPV6_H%g s%@ISC_IPV6_O@%$ISC_IPV6_O%g s%@ISC_ISCIPV6_O@%$ISC_ISCIPV6_O%g s%@ISC_IPV6_C@%$ISC_IPV6_C%g -s%@ISC_NET_NEEDNTOP@%$ISC_NET_NEEDNTOP%g -s%@ISC_NET_NEEDPTON@%$ISC_NET_NEEDPTON%g -s%@ISC_NET_NEEDATON@%$ISC_NET_NEEDATON%g -s%@ISC_PRINT_NEEDVSNPRINTF@%$ISC_PRINT_NEEDVSNPRINTF%g +s%@ISC_PLATFORM_NEEDNTOP@%$ISC_PLATFORM_NEEDNTOP%g +s%@ISC_PLATFORM_NEEDPTON@%$ISC_PLATFORM_NEEDPTON%g +s%@ISC_PLATFORM_NEEDATON@%$ISC_PLATFORM_NEEDATON%g +s%@ISC_PLATFORM_NEEDVSNPRINTF@%$ISC_PLATFORM_NEEDVSNPRINTF%g s%@ISC_EXTRA_OBJS@%$ISC_EXTRA_OBJS%g s%@ISC_EXTRA_SRCS@%$ISC_EXTRA_SRCS%g s%@BIND9_TOP_BUILDDIR@%$BIND9_TOP_BUILDDIR%g +s%@BIND9_ISC_BUILDINCLUDE@%$BIND9_ISC_BUILDINCLUDE%g +s%@BIND9_DNS_BUILDINCLUDE@%$BIND9_DNS_BUILDINCLUDE%g +/@BIND9_INCLUDES@/r $BIND9_INCLUDES +s%@BIND9_INCLUDES@%%g /@BIND9_MAKE_RULES@/r $BIND9_MAKE_RULES s%@BIND9_MAKE_RULES@%%g /@BIND9_VERSION@/r $BIND9_VERSION @@ -3166,6 +3183,7 @@ EOF cat >> $CONFIG_STATUS <], [struct sockaddr sa; sa.sa_len = 0; return (0);], [AC_MSG_RESULT(yes) - ISC_NET_HAVESALEN="#define ISC_NET_HAVESALEN 1"], + ISC_PLATFORM_HAVESALEN="#define ISC_PLATFORM_HAVESALEN 1"], [AC_MSG_RESULT(no) - ISC_NET_HAVESALEN="#undef ISC_NET_HAVESALEN"]) -AC_SUBST(ISC_NET_HAVESALEN) + ISC_PLATFORM_HAVESALEN="#undef ISC_PLATFORM_HAVESALEN"]) +AC_SUBST(ISC_PLATFORM_HAVESALEN) dnl dnl Look for a 4.4BSD or 4.3BSD struct msghdr @@ -273,10 +273,10 @@ AC_TRY_COMPILE([ #include ], [struct msghdr msg; msg.msg_flags = 0; return (0);], [AC_MSG_RESULT(4.4BSD) - ISC_NET_MSGHDRFLAVOR="#define ISC_NET_BSD44MSGHDR 1"], + ISC_PLATFORM_MSGHDRFLAVOR="#define ISC_NET_BSD44MSGHDR 1"], [AC_MSG_RESULT(4.3BSD) - ISC_NET_MSGHDRFLAVOR="#define ISC_NET_BSD43MSGHDR 1"]) -AC_SUBST(ISC_NET_MSGHDRFLAVOR) + ISC_PLATFORM_MSGHDRFLAVOR="#define ISC_NET_BSD43MSGHDR 1"]) +AC_SUBST(ISC_PLATFORM_MSGHDRFLAVOR) dnl dnl Look for in_port_t. @@ -286,10 +286,10 @@ AC_TRY_COMPILE([ #include ], [in_port_t port = 25; return (0);], [AC_MSG_RESULT(yes) - ISC_NET_NEEDPORTT="#undef ISC_NET_NEEDPORTT"], + ISC_PLATFORM_NEEDPORTT="#undef ISC_PLATFORM_NEEDPORTT"], [AC_MSG_RESULT(no) - ISC_NET_NEEDPORTT="#define ISC_NET_NEEDPORTT 1"]) -AC_SUBST(ISC_NET_NEEDPORTT) + ISC_PLATFORM_NEEDPORTT="#define ISC_PLATFORM_NEEDPORTT 1"]) +AC_SUBST(ISC_PLATFORM_NEEDPORTT) dnl dnl Look for a sysctl call to get the list of network interfaces. @@ -344,14 +344,14 @@ AC_TRY_COMPILE([ #include ], [struct sockaddr_in6 sin6; return (0);], [AC_MSG_RESULT(yes) - ISC_NET_HAVEIPV6="#define ISC_NET_HAVEIPV6 1"], + ISC_PLATFORM_HAVEIPV6="#define ISC_PLATFORM_HAVEIPV6 1"], [AC_MSG_RESULT(no) - ISC_NET_HAVEIPV6="#undef ISC_NET_HAVEIPV6" + ISC_PLATFORM_HAVEIPV6="#undef ISC_PLATFORM_HAVEIPV6" ISC_IPV6_H="ipv6.h" ISC_IPV6_O="ipv6.$O" ISC_ISCIPV6_O="unix/ipv6.$O" ISC_IPV6_C="ipv6.c"]) -AC_SUBST(ISC_NET_HAVEIPV6) +AC_SUBST(ISC_PLATFORM_HAVEIPV6) AC_SUBST(ISC_IPV6_H) AC_SUBST(ISC_IPV6_O) AC_SUBST(ISC_ISCIPV6_O) @@ -363,38 +363,51 @@ dnl after the libtool checking, so we can put the right suffix on dnl the files. dnl AC_CHECK_FUNC(inet_ntop, - [ISC_NET_NEEDNTOP="#undef ISC_NET_NEEDNTOP"], + [ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP"], [ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c" - ISC_NET_NEEDNTOP="#define ISC_NET_NEEDNTOP 1"] + ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1"] ) AC_CHECK_FUNC(inet_pton, - [ISC_NET_NEEDPTON="#undef ISC_NET_NEEDPTON"], + [ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON"], [ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_pton.$O" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_pton.c" - ISC_NET_NEEDPTON="#define ISC_NET_NEEDPTON 1"] + ISC_PLATFORM_NEEDPTON="#define ISC_PLATFORM_NEEDPTON 1"] ) AC_CHECK_FUNC(inet_aton, - [ISC_NET_NEEDATON="#undef ISC_NET_NEEDATON"], + [ISC_PLATFORM_NEEDATON="#undef ISC_PLATFORM_NEEDATON"], [ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_aton.$O" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_aton.c" - ISC_NET_NEEDATON="#define ISC_NET_NEEDATON 1"] + ISC_PLATFORM_NEEDATON="#define ISC_PLATFORM_NEEDATON 1"] ) AC_CHECK_FUNC(vsnprintf, - [ISC_PRINT_NEEDVSNPRINTF="#undef ISC_PRINT_NEEDVSNPRINTF"], + [ISC_PLATFORM_NEEDVSNPRINTF="#undef ISC_PLATFORM_NEEDVSNPRINTF"], [ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS print.$O" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS print.c" - ISC_PRINT_NEEDVSNPRINTF="#define ISC_PRINT_NEEDVSNPRINTF 1"]) -AC_SUBST(ISC_NET_NEEDNTOP) -AC_SUBST(ISC_NET_NEEDPTON) -AC_SUBST(ISC_NET_NEEDATON) -AC_SUBST(ISC_PRINT_NEEDVSNPRINTF) + ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1"]) +AC_SUBST(ISC_PLATFORM_NEEDNTOP) +AC_SUBST(ISC_PLATFORM_NEEDPTON) +AC_SUBST(ISC_PLATFORM_NEEDATON) +AC_SUBST(ISC_PLATFORM_NEEDVSNPRINTF) AC_SUBST(ISC_EXTRA_OBJS) AC_SUBST(ISC_EXTRA_SRCS) AC_SUBST(BIND9_TOP_BUILDDIR) BIND9_TOP_BUILDDIR=`pwd` +AC_SUBST(BIND9_ISC_BUILDINCLUDE) +AC_SUBST(BIND9_DNS_BUILDINCLUDE) +if test "X$srcdir" != "X"; then + BIND9_ISC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc/include" + BIND9_DNS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/dns/include" +else + BIND9_ISC_BUILDINCLUDE="" + BIND9_DNS_BUILDINCLUDE="" +fi + +AC_SUBST_FILE(BIND9_INCLUDES) +BIND9_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes + AC_SUBST_FILE(BIND9_MAKE_RULES) BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules @@ -409,6 +422,7 @@ LIBDNS_API=$srcdir/lib/dns/api AC_OUTPUT( make/rules + make/includes Makefile make/Makefile make/mkdep @@ -416,11 +430,10 @@ AC_OUTPUT( lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile - lib/isc/include/isc/print.h + lib/isc/include/isc/platform.h lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile - lib/isc/unix/include/isc/net.h lib/isc/nls/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index 3f440ddf41..4b44ce995b 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -21,16 +21,9 @@ top_srcdir = @top_srcdir@ @LIBDNS_API@ -CINCLUDES = -I../isc/unix/include \ - -I${srcdir}/../isc/unix/include \ - -I${srcdir}/../isc/pthreads/include \ - -I${srcdir}/../isc/include \ - -I../isc/include \ - -I./include \ - -I. \ - -I${srcdir}/include \ - -I${srcdir}/sec/dst/include \ - -I${srcdir} +@BIND9_INCLUDES@ + +CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/lib/dns/config/Makefile.in b/lib/dns/config/Makefile.in index 709b842308..3946a9a86f 100644 --- a/lib/dns/config/Makefile.in +++ b/lib/dns/config/Makefile.in @@ -19,14 +19,9 @@ top_srcdir = @top_srcdir@ @BIND9_VERSION@ -CINCLUDES = -I${srcdir}/../../isc/unix/include \ - -I${srcdir}/../../isc/pthreads/include \ - -I${srcdir}/../../isc/include \ - -I${srcdir}/../include \ - -I${srcdir}/.. \ - -I. \ - -I../include \ - -I../../isc/unix/include +@BIND9_INCLUDES@ + +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/lib/dns/sec/dnssafe/Makefile.in b/lib/dns/sec/dnssafe/Makefile.in index 5967dd4600..c6dbb4f1ea 100644 --- a/lib/dns/sec/dnssafe/Makefile.in +++ b/lib/dns/sec/dnssafe/Makefile.in @@ -17,18 +17,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_VERSION@ +@BIND9_INCLUDES@ -@LIBDNS_API@ - -CINCLUDES = -I../../../isc/unix/include \ - -I${srcdir}/../../../isc/unix/include \ - -I${srcdir}/../../../isc/pthreads/include \ - -I${srcdir}/../../../isc/include \ - -I${srcdir}/include \ - -I${srcdir} \ - -I./include \ - -I. +CINCLUDES = -I${srcdir} ${ISC_INCLUDES} CDEFINES = CWARNINGS = diff --git a/lib/dns/sec/dst/Makefile.in b/lib/dns/sec/dst/Makefile.in index a6cec298b1..bbcb2c1d78 100644 --- a/lib/dns/sec/dst/Makefile.in +++ b/lib/dns/sec/dst/Makefile.in @@ -17,22 +17,12 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_VERSION@ +@BIND9_INCLUDES@ -@LIBDNS_API@ - -CINCLUDES = -I../../../isc/unix/include \ - -I${srcdir}/../../../isc/unix/include \ - -I${srcdir}/../../../isc/pthreads/include \ - -I${srcdir}/../../../isc/include \ - -I../../../dns/include \ - -I${srcdir}/../../../dns/include \ - -I${srcdir}/include \ - -I${srcdir} \ +CINCLUDES = -I${srcdir} \ -I${srcdir}/../dnssafe \ -I${srcdir}/../openssl/include \ - -I./include \ - -I. + ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = -DUSE_MD5 -DDNSSAFE -DOPENSSL CWARNINGS = diff --git a/lib/dns/sec/openssl/Makefile.in b/lib/dns/sec/openssl/Makefile.in index fa3c0b77ef..551b8d0515 100644 --- a/lib/dns/sec/openssl/Makefile.in +++ b/lib/dns/sec/openssl/Makefile.in @@ -17,18 +17,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_VERSION@ - -@LIBDNS_API@ - -CINCLUDES = -I../../../isc/unix/include \ - -I${srcdir}/../../../isc/unix/include \ - -I${srcdir}/../../../isc/pthreads/include \ - -I${srcdir}/../../../isc/include \ - -I${srcdir}/include \ - -I${srcdir} \ - -I./include \ - -I. +CINCLUDES = -I${srcdir}/include CDEFINES = -DMFUNC CWARNINGS = diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in index b9a51c4f31..1ef4368d8d 100644 --- a/lib/isc/Makefile.in +++ b/lib/isc/Makefile.in @@ -21,9 +21,9 @@ top_srcdir = @top_srcdir@ @LIBISC_API@ -CINCLUDES = -I./unix/include \ - -I${srcdir}/unix/include \ +CINCLUDES = -I${srcdir}/unix/include \ -I${srcdir}/pthreads/include \ + -I./include \ -I${srcdir}/include CDEFINES = CWARNINGS = diff --git a/lib/isc/include/isc/.cvsignore b/lib/isc/include/isc/.cvsignore index 4794ba417e..6dd03c914c 100644 --- a/lib/isc/include/isc/.cvsignore +++ b/lib/isc/include/isc/.cvsignore @@ -1,2 +1,2 @@ Makefile -print.h +platform.h diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in index ac1aa06e54..5eca6753eb 100644 --- a/lib/isc/include/isc/Makefile.in +++ b/lib/isc/include/isc/Makefile.in @@ -23,7 +23,7 @@ HEADERS = assertions.h base64.h boolean.h buffer.h bufferlist.h \ error.h event.h \ eventclass.h heap.h int.h interfaceiter.h lang.h lex.h lib.h \ list.h magic.h mem.h msgcat.h mutexblock.h netaddr.h \ - rbtgen.h region.h result.h \ + print.h rbtgen.h region.h result.h \ resultclass.h rwlock.h serial.h sockaddr.h socket.h str.h \ symtab.h task.h timer.h types.h @@ -42,8 +42,9 @@ installdirs: install:: installdirs for i in ${HEADERS}; do \ - ${INSTALL_DATA} $(srcdir)/$$i ${includedir}/isc ; \ + ${INSTALL_DATA} ${srcdir}/$$i ${includedir}/isc ; \ done + ${INSTALL_DATA} platform.h ${includedir}/isc distclean:: - rm -f print.h + rm -f platform.h diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in new file mode 100644 index 0000000000..ea4e3f9d28 --- /dev/null +++ b/lib/isc/include/isc/platform.h.in @@ -0,0 +1,86 @@ +/* + * Copyright (C) 1999 Internet Software Consortium. + * + * Permission to use, copy, modify, and 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM 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. + */ + +#ifndef ISC_PLATFORM_H +#define ISC_PLATFORM_H 1 + +/***** + ***** Platform-dependent defines. + *****/ + +/*** + *** Network. + ***/ + +/* + * If sockaddrs on this system have an sa_len field, ISC_PLATFORM_HAVESALEN + * will be defined. + */ +@ISC_PLATFORM_HAVESALEN@ + +/* + * If this system has the IPv6 structure definitions, ISC_PLATFORM_HAVEIPV6 + * will be defined. + */ +@ISC_PLATFORM_HAVEIPV6@ + +/* + * If this system needs inet_ntop(), ISC_PLATFORM_NEEDNTOP will be defined. + */ +@ISC_PLATFORM_NEEDNTOP@ + +/* + * If this system needs inet_pton(), ISC_PLATFORM_NEEDPTON will be defined. + */ +@ISC_PLATFORM_NEEDPTON@ + +/* + * If this system needs inet_aton(), ISC_PLATFORM_NEEDATON will be defined. + */ +@ISC_PLATFORM_NEEDATON@ + +/* + * If this system needs in_port_t, ISC_PLATFORM_NEEDPORTT will be defined. + */ +@ISC_PLATFORM_NEEDPORTT@ + +/* + * Define either ISC_PLATFORM_BSD44MSGHDR or ISC_PLATFORM_BSD43MSGHDR + */ +@ISC_PLATFORM_MSGHDRFLAVOR@ + + +/*** + *** Printing. + ***/ + +/* + * If this system needs vsnprintf() and snprintf(), ISC_PRINT_NEEDVSNPRINTF + * will be defined. + */ +@ISC_PLATFORM_NEEDVSNPRINTF@ + + +/* + * Tell emacs to use C mode for this file. + * + * Local Variables: + * mode: c + * End: + */ + +#endif /* ISC_PLATFORM_H */ diff --git a/lib/isc/include/isc/print.h.in b/lib/isc/include/isc/print.h similarity index 88% rename from lib/isc/include/isc/print.h.in rename to lib/isc/include/isc/print.h index e51dc54f57..fd05613ffd 100644 --- a/lib/isc/include/isc/print.h.in +++ b/lib/isc/include/isc/print.h @@ -18,16 +18,6 @@ #ifndef ISC_PRINT_H #define ISC_PRINT_H -/*** - *** Defines - ***/ - -/* - * Define if the OS does not supply a {v}snprintf() implementation. - */ - -@ISC_PRINT_NEEDVSNPRINTF@ - /*** *** Imports ***/ @@ -37,6 +27,7 @@ #include #include +#include /*** *** Functions @@ -44,7 +35,7 @@ ISC_LANG_BEGINDECLS -#ifdef ISC_PRINT_NEEDVSNPRINTF +#ifdef ISC_PLATFORM_NEEDVSNPRINTF int isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap); #define vsnprintf isc_print_vsnprintf @@ -56,4 +47,4 @@ isc_print_snprintf(char *str, size_t size, const char *format, ...); ISC_LANG_ENDDECLS -#endif +#endif /* ISC_PRINT_H */ diff --git a/lib/isc/nls/Makefile.in b/lib/isc/nls/Makefile.in index 12b63e751d..cdb622a0d6 100644 --- a/lib/isc/nls/Makefile.in +++ b/lib/isc/nls/Makefile.in @@ -18,7 +18,10 @@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ CINCLUDES = -I${srcdir}/include \ - -I${srcdir}/../include + -I../include \ + -I${srcdir}/../include \ + -I${srcdir}/.. + CDEFINES = CWARNINGS = diff --git a/lib/isc/pthreads/Makefile.in b/lib/isc/pthreads/Makefile.in index 9e7e590e74..902b8343bc 100644 --- a/lib/isc/pthreads/Makefile.in +++ b/lib/isc/pthreads/Makefile.in @@ -19,7 +19,10 @@ top_srcdir = @top_srcdir@ CINCLUDES = -I${srcdir}/include \ -I${srcdir}/../unix/include \ - -I${srcdir}/../include + -I../include \ + -I${srcdir}/../include \ + -I${srcdir}/.. + CDEFINES = CWARNINGS = diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in index 07c8394a03..4e7e8d8f4e 100644 --- a/lib/isc/unix/Makefile.in +++ b/lib/isc/unix/Makefile.in @@ -17,11 +17,12 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -CINCLUDES = -I${srcdir}/.. \ - -I./include \ - -I${srcdir}/include \ +CINCLUDES = -I${srcdir}/include \ -I${srcdir}/../pthreads/include \ - -I${srcdir}/../include + -I../include \ + -I${srcdir}/../include \ + -I${srcdir}/.. + CDEFINES = CWARNINGS = diff --git a/lib/isc/unix/include/isc/.cvsignore b/lib/isc/unix/include/isc/.cvsignore index dbcc054f88..f3c7a7c5da 100644 --- a/lib/isc/unix/include/isc/.cvsignore +++ b/lib/isc/unix/include/isc/.cvsignore @@ -1,2 +1 @@ Makefile -net.h diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in index 661ba35a27..2e0ad44fe6 100644 --- a/lib/isc/unix/include/isc/Makefile.in +++ b/lib/isc/unix/include/isc/Makefile.in @@ -38,6 +38,3 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${includedir}/isc ; \ done - -distclean:: - rm -f net.h diff --git a/lib/isc/unix/include/isc/net.h.in b/lib/isc/unix/include/isc/net.h similarity index 75% rename from lib/isc/unix/include/isc/net.h.in rename to lib/isc/unix/include/isc/net.h index b2aec787f6..faff3b9213 100644 --- a/lib/isc/unix/include/isc/net.h.in +++ b/lib/isc/unix/include/isc/net.h @@ -61,42 +61,6 @@ * RFC 2553 */ -/*** - *** Defines. - ***/ - -/* - * If sockaddrs on this system have an sa_len field, ISC_NET_HAVESALEN will - * be defined. - */ -@ISC_NET_HAVESALEN@ - -/* - * If this system has the IPv6 structure definitions, ISC_NET_HAVEIPV6 - * will be defined. - */ -@ISC_NET_HAVEIPV6@ - -/* - * If this system needs inet_ntop(), ISC_NET_NEEDNTOP will be defined. - */ -@ISC_NET_NEEDNTOP@ - -/* - * If this system needs inet_pton(), ISC_NET_NEEDPTON will be defined. - */ -@ISC_NET_NEEDPTON@ - -/* - * If this system needs inet_aton(), ISC_NET_NEEDATON will be defined. - */ -@ISC_NET_NEEDATON@ - -/* - * If this system needs in_port_t, ISC_NET_NEEDPORTT will be defined. - */ -@ISC_NET_NEEDPORTT@ - /*** *** Imports. ***/ @@ -107,6 +71,7 @@ #include #include +#include #include #ifndef AF_INET6 @@ -117,19 +82,14 @@ #define PF_INET6 AF_INET6 #endif -#ifndef ISC_NET_HAVEIPV6 +#ifndef ISC_PLATFORM_HAVEIPV6 #include #endif -/* - * Define either ISC_NET_BSD44MSGHDR or ISC_NET_BSD43MSGHDR - */ -@ISC_NET_MSGHDRFLAVOR@ - /* * Ensure type in_port_t is defined. */ -#ifdef ISC_NET_NEEDPORTT +#ifdef ISC_PLATFORM_NEEDPORTT #include typedef isc_uint16_t in_port_t; @@ -137,11 +97,11 @@ typedef isc_uint16_t in_port_t; /* * If this system does not have MSG_TRUNC (as returned from recvmsg()) - * ISC_NET_RECVOVERFLOW will be defined. This will enable the MSG_TRUNC + * ISC_PLATFORM_RECVOVERFLOW will be defined. This will enable the MSG_TRUNC * faking code in socket.c. */ #ifndef MSG_TRUNC -#define ISC_NET_RECVOVERFLOW +#define ISC_PLATFORM_RECVOVERFLOW #endif /*** @@ -172,23 +132,21 @@ isc_net_probeipv6(void); * ISC_R_UNEXPECTED */ -#ifdef ISC_NET_NEEDNTOP +#ifdef ISC_PLATFORM_NEEDNTOP const char *isc_net_ntop(int af, const void *src, char *dst, size_t size); #define inet_ntop isc_net_ntop #endif -#ifdef ISC_NET_NEEDPTON +#ifdef ISC_PLATFORM_NEEDPTON int isc_net_pton(int af, const char *src, void *dst); #define inet_pton isc_net_pton #endif -#ifdef ISC_NET_NEEDATON +#ifdef ISC_PLATFORM_NEEDATON int isc_net_aton(const char *cp, struct in_addr *addr); #define inet_aton isc_net_aton #endif -#endif /* ISC_NET_H */ - /* * Tell emacs to use C mode for this file. * @@ -196,3 +154,5 @@ int isc_net_aton(const char *cp, struct in_addr *addr); * mode: c * End: */ + +#endif /* ISC_NET_H */ diff --git a/make/.cvsignore b/make/.cvsignore index 49821dede2..317ec27c1c 100644 --- a/make/.cvsignore +++ b/make/.cvsignore @@ -1,3 +1,4 @@ Makefile +includes rules mkdep diff --git a/make/includes.in b/make/includes.in new file mode 100644 index 0000000000..dffb967f69 --- /dev/null +++ b/make/includes.in @@ -0,0 +1,12 @@ +ISC_INCLUDES = @BIND9_ISC_BUILDINCLUDE@ \ + -I${top_srcdir}/lib/isc \ + -I${top_srcdir}/lib/isc/include \ + -I${top_srcdir}/lib/isc/unix/include \ + -I${top_srcdir}/lib/isc/pthreads/include + +DNS_INCLUDES = @BIND9_DNS_BUILDINCLUDE@ \ + -I${top_srcdir}/lib/dns/include \ + -I${top_srcdir}/lib/dns/sec/dst/include + +TEST_INCLUDES = \ + -I${top_srcdir}/lib/tests/include