upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build fix outside sourcedir.

Browse source 
git-svn-id: file:///svn/unbound/trunk@722 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2007-10-31 08:30:47 +00:00
parent fe44f5918a
commit 75c30382ba
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile.in
View file

@ -52,15 +52,19 @@ LINTFLAGS+="-DBN_ULONG=unsigned long" -Dkrb5_int32=int "-Dkrb5_ui_4=unsigned int
INSTALL=$(srcdir)/install-sh INSTALL=$(srcdir)/install-sh
COMMON_SRC=$(wildcard services/*.c services/cache/*.c util/*.c \ COMMON_SRC=$(patsubst $(srcdir)/%,%, $(wildcard $(srcdir)/services/*.c \
util/data/*.c util/storage/*.c iterator/*.c validator/*.c) \ $(srcdir)/services/cache/*.c $(srcdir)/util/*.c \
$(srcdir)/util/data/*.c $(srcdir)/util/storage/*.c \
$(srcdir)/iterator/*.c $(srcdir)/validator/*.c)) \
util/configparser.c util/configlexer.c testcode/checklocks.c util/configparser.c util/configlexer.c testcode/checklocks.c
COMMON_OBJ=$(addprefix $(BUILD),$(COMMON_SRC:.c=.o)) COMMON_OBJ=$(addprefix $(BUILD),$(COMMON_SRC:.c=.o))
COMPAT_OBJ=$(addprefix $(BUILD)compat/,$(LIBOBJS)) COMPAT_OBJ=$(addprefix $(BUILD)compat/,$(LIBOBJS))
UNITTEST_SRC=$(wildcard testcode/unit*.c) testcode/readhex.c \ UNITTEST_SRC=$(patsubst $(srcdir)/%,%, $(wildcard $(srcdir)/testcode/unit*.c)) \
testcode/ldns-testpkts.c checkconf/worker_cb.c $(COMMON_SRC) testcode/readhex.c testcode/ldns-testpkts.c checkconf/worker_cb.c \
$(COMMON_SRC)
UNITTEST_OBJ=$(addprefix $(BUILD),$(UNITTEST_SRC:.c=.o)) $(COMPAT_OBJ) UNITTEST_OBJ=$(addprefix $(BUILD),$(UNITTEST_SRC:.c=.o)) $(COMPAT_OBJ)
DAEMON_SRC=$(wildcard daemon/*.c) $(COMMON_SRC) DAEMON_SRC=$(patsubst $(srcdir)/%,%, $(wildcard $(srcdir)/daemon/*.c)) \
$(COMMON_SRC)
DAEMON_OBJ=$(addprefix $(BUILD),$(DAEMON_SRC:.c=.o)) $(COMPAT_OBJ) DAEMON_OBJ=$(addprefix $(BUILD),$(DAEMON_SRC:.c=.o)) $(COMPAT_OBJ)
CHECKCONF_SRC=checkconf/unbound-checkconf.c checkconf/worker_cb.c $(COMMON_SRC) CHECKCONF_SRC=checkconf/unbound-checkconf.c checkconf/worker_cb.c $(COMMON_SRC)
CHECKCONF_OBJ=$(addprefix $(BUILD),$(CHECKCONF_SRC:.c=.o)) $(COMPAT_OBJ) CHECKCONF_OBJ=$(addprefix $(BUILD),$(CHECKCONF_SRC:.c=.o)) $(COMPAT_OBJ)

4
configure vendored
View file

@ -24475,7 +24475,7 @@ fi
else else
if test ! -f ldns-src.tar.gz; then if test ! -f $srcdir/ldns-src.tar.gz; then
{ { echo "$as_me:$LINENO: error: No ldns library found and no ldns-src.tar.gz, use --with-ldns=path." >&5 { { echo "$as_me:$LINENO: error: No ldns library found and no ldns-src.tar.gz, use --with-ldns=path." >&5
echo "$as_me: error: No ldns library found and no ldns-src.tar.gz, use --with-ldns=path." >&2;} echo "$as_me: error: No ldns library found and no ldns-src.tar.gz, use --with-ldns=path." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -24487,7 +24487,7 @@ echo "*** Building ldns library from package included in this one. ***"
echo "*** ***" echo "*** ***"
echo "****************************************************************" echo "****************************************************************"
if test -d ldns-src; then rm -rf ldns-src; fi if test -d ldns-src; then rm -rf ldns-src; fi
mkdir ldns-src; (cd ldns-src; gzip -cd ../ldns-src.tar.gz | tar xf -) mkdir ldns-src; cp $srcdir/ldns-src.tar.gz ldns-src/ldns-src.tar.gz; (cd ldns-src; gzip -cd ldns-src.tar.gz | tar xf -); rm -f ldns-src/ldns-src.tar.gz
ldnsdir=`ls -d ldns-src/ldns*` ldnsdir=`ls -d ldns-src/ldns*`
{ echo "$as_me:$LINENO: Configure $ldnsdir" >&5 { echo "$as_me:$LINENO: Configure $ldnsdir" >&5
echo "$as_me: Configure $ldnsdir" >&6;} echo "$as_me: Configure $ldnsdir" >&6;}

4
configure.ac
View file

@ -559,7 +559,7 @@ fi
] , [ ] , [
dnl use the builtin ldns-src.tar.gz file to build ldns. dnl use the builtin ldns-src.tar.gz file to build ldns.
if test ! -f ldns-src.tar.gz; then if test ! -f $srcdir/ldns-src.tar.gz; then
AC_MSG_ERROR([No ldns library found and no ldns-src.tar.gz, use --with-ldns=path.]) AC_MSG_ERROR([No ldns library found and no ldns-src.tar.gz, use --with-ldns=path.])
fi fi
echo "****************************************************************" echo "****************************************************************"
@ -569,7 +569,7 @@ echo "*** Building ldns library from package included in this one. ***"
echo "*** ***" echo "*** ***"
echo "****************************************************************" echo "****************************************************************"
if test -d ldns-src; then rm -rf ldns-src; fi if test -d ldns-src; then rm -rf ldns-src; fi
mkdir ldns-src; (cd ldns-src; gzip -cd ../ldns-src.tar.gz | tar xf -) mkdir ldns-src; cp $srcdir/ldns-src.tar.gz ldns-src/ldns-src.tar.gz; (cd ldns-src; gzip -cd ldns-src.tar.gz | tar xf -); rm -f ldns-src/ldns-src.tar.gz
ldnsdir=`ls -d ldns-src/ldns*` ldnsdir=`ls -d ldns-src/ldns*`
AC_MSG_NOTICE([Configure $ldnsdir]) AC_MSG_NOTICE([Configure $ldnsdir])
echo "(cd $ldnsdir; ./configure)" echo "(cd $ldnsdir; ./configure)"

1
doc/Changelog
View file

@ -1,5 +1,6 @@
31 October 2007: Wouter 31 October 2007: Wouter
- cache-max-ttl config option. - cache-max-ttl config option.
- building outside sourcedir works again.
30 October 2007: Wouter 30 October 2007: Wouter
- fixup assertion failure that relied on compressed names to be - fixup assertion failure that relied on compressed names to be