Commit c3b9fad5 authored by Mark Andrews's avatar Mark Andrews

3420. [bug] Address VPATH compilation issues. [RT #31879]

parent 39bfdc2f
3420. [bug] Address VPATH compilation issues. [RT #31879]
3419. [bug] Memory leak on validation cancel. [RT #31869]
3418. [func] New XML schema (version 3.0) for the statistics channel
......
......@@ -171,3 +171,6 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
@DLZ_DRIVER_RULES@
named-symtbl.@O@: named-symtbl.c
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
......@@ -29,7 +29,7 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES}
@BIND9_MAKE_RULES@
dnssec-checkds: ${srcdir}/dnssec-checkds.py
dnssec-checkds: dnssec-checkds.py
doc man:: ${MANOBJS}
......@@ -46,3 +46,6 @@ install:: ${TARGETS} installdirs
clean distclean::
rm -f ${TARGETS}
distclean::
rm -f dnssec-checkds.py
This diff is collapsed.
......@@ -3228,7 +3228,15 @@ if test "$atf" = yes; then
ATFBUILD=atf-src
AC_SUBST(ATFBUILD)
AC_CONFIG_COMMANDS([atf-config],
[cd unit/atf-src; ${SHELL} ./configure MISSING=: --prefix $atfdir; cd ../..],
[(
mkdir -p unit/atf-src;
cd unit/atf-src;
case "$srcdir" in
/*) ;;
*) srcdir="../../$srcdir";;
esac
${SHELL} ${srcdir}${srcdir:+/unit/atf-src/}./configure MISSING=: --prefix $atfdir;
) ],
[atfdir=`pwd`/unit/atf])
AC_MSG_RESULT(building ATF from bind9/unit/atf-src)
fi
......
......@@ -53,11 +53,13 @@ TARGETS = master_test@EXEEXT@ dbiterator_test@EXEEXT@ time_test@EXEEXT@ \
@BIND9_MAKE_RULES@
master_test@EXEEXT@: master_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${PERL} mkraw.pl < testdata/master/master12.data.in \
test -d testdata || mkdir testdata
test -d testdata/master || mkdir testdata/master
${PERL} ${srcdir}/mkraw.pl < ${srcdir}/testdata/master/master12.data.in \
> testdata/master/master12.data
${PERL} mkraw.pl < testdata/master/master13.data.in \
${PERL} ${srcdir}/mkraw.pl < ${srcdir}/testdata/master/master13.data.in \
> testdata/master/master13.data
${PERL} mkraw.pl < testdata/master/master14.data.in \
${PERL} ${srcdir}/mkraw.pl < ${srcdir}/testdata/master/master14.data.in \
> testdata/master/master14.data
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
master_test.@O@ dnstest.@O@ ${DNSLIBS} \
......
......@@ -30,7 +30,7 @@
#include <dns/fixedname.h>
#include <dns/result.h>
#include <dns/compress.h>
#include <dnstest.h>
#include "dnstest.h"
#include <isc/app.h>
#include <isc/buffer.h>
......
......@@ -16,10 +16,12 @@
top_srcdir = @top_srcdir@
srcdir = @top_srcdir@/lib/isc/nls
export_srcdir = @top_srcdir@/lib/export
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/unix/include \
-I${export_srcdir}/isc/include \
${ISC_INCLUDES}
CDEFINES =
......
......@@ -16,11 +16,13 @@
top_srcdir = @top_srcdir@
srcdir = @top_srcdir@/lib/isc/nothreads
export_srcdir = @top_srcdir@/lib/export
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/include \
-I${srcdir}/../unix/include \
-I${export_srcdir}/isc/include \
-I../include \
-I${srcdir}/../include \
-I${srcdir}/..
......
......@@ -16,11 +16,13 @@
top_srcdir = @top_srcdir@
srcdir = @top_srcdir@/lib/isc/pthreads
export_srcdir = @top_srcdir@/lib/export
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/include \
-I${srcdir}/../unix/include \
-I${export_srcdir}/isc/include \
-I../include \
-I${srcdir}/../include \
-I${srcdir}/..
......
......@@ -16,11 +16,13 @@
top_srcdir = @top_srcdir@
srcdir = @top_srcdir@/lib/isc/unix
export_srcdir = @top_srcdir@/lib/export
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/include \
-I${srcdir}/../@ISC_THREAD_DIR@/include \
-I${export_srcdir}/isc/include \
-I../include \
-I${srcdir}/../include \
-I${srcdir}/..
......
......@@ -193,24 +193,24 @@ MKDEP = ${SHELL} ${top_builddir}/make/mkdep
### See bin/check/Makefile.in for a complete example of the use of LIBS0.
###
FINALBUILDCMD = if [ X"${MKSYMTBL_PROGRAM}" = X -o X"$${MAKE_SYMTABLE:-${ALWAYS_MAKE_SYMTABLE}}" = X ] ; then \
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} \
-o $@ $${BASEOBJS} $${LIBS0} ${LIBS}; \
else \
rm -f $@tmp0; \
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} \
-o $@tmp0 $${BASEOBJS} $${LIBS0} ${LIBS} || exit 1; \
rm -f $@-symtbl.c $@-symtbl.@O@; \
${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl \
-o $@-symtbl.c $@tmp0 || exit 1; \
$(MAKE) $@-symtbl.@O@ || exit 1; \
rm -f $@tmp1; \
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} \
-o $@tmp1 $${BASEOBJS} $@-symtbl.@O@ $${LIBS0} ${NOSYMLIBS} || exit 1; \
rm -f $@-symtbl.c $@-symtbl.@O@; \
${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl \
-o $@-symtbl.c $@tmp1 || exit 1; \
$(MAKE) $@-symtbl.@O@ || exit 1; \
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} \
-o $@tmp2 $${BASEOBJS} $@-symtbl.@O@ $${LIBS0} ${NOSYMLIBS}; \
${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl \
-o $@-symtbl2.c $@tmp2; \
......@@ -223,7 +223,7 @@ FINALBUILDCMD = if [ X"${MKSYMTBL_PROGRAM}" = X -o X"$${MAKE_SYMTABLE:-${ALWAYS_
${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl \
-o $@-symtbl.c $@tmp2 || exit 1; \
$(MAKE) $@-symtbl.@O@ || exit 1; \
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} \
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} \
${LDFLAGS} -o $@tmp2 $${BASEOBJS} $@-symtbl.@O@ \
$${LIBS0} ${NOSYMLIBS}; \
${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl \
......
......@@ -4,7 +4,7 @@ PATH="@ATFBIN@:${PATH}"
export PATH
status=0
if [ -n "@ATFBIN@" ]
if [ -n "@ATFBIN@" -a -f Atffile ]
then
echo "I: unit tests"
atf-run > atf.out
......
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