Build fix outside sourcedir.

git-svn-id: file:///svn/unbound/trunk@722 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/Makefile.in b/Makefile.in
index a5761694394421d4c339503f803c6c21275e29e8..70772d2628d4583be1a4b5e3af40053f51865a0d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,15 +52,19 @@ LINTFLAGS+="-DBN_ULONG=unsigned long" -Dkrb5_int32=int "-Dkrb5_ui_4=unsigned int
 
 INSTALL=$(srcdir)/install-sh
 
-COMMON_SRC=$(wildcard services/*.c services/cache/*.c util/*.c \
-       util/data/*.c util/storage/*.c iterator/*.c validator/*.c) \
+COMMON_SRC=$(patsubst $(srcdir)/%,%, $(wildcard $(srcdir)/services/*.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
 COMMON_OBJ=$(addprefix $(BUILD),$(COMMON_SRC:.c=.o))
 COMPAT_OBJ=$(addprefix $(BUILD)compat/,$(LIBOBJS))
-UNITTEST_SRC=$(wildcard testcode/unit*.c) testcode/readhex.c \
-       testcode/ldns-testpkts.c checkconf/worker_cb.c $(COMMON_SRC)
+UNITTEST_SRC=$(patsubst $(srcdir)/%,%, $(wildcard $(srcdir)/testcode/unit*.c)) \
+       testcode/readhex.c testcode/ldns-testpkts.c checkconf/worker_cb.c \
+       $(COMMON_SRC)
 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)
 CHECKCONF_SRC=checkconf/unbound-checkconf.c checkconf/worker_cb.c $(COMMON_SRC)
 CHECKCONF_OBJ=$(addprefix $(BUILD),$(CHECKCONF_SRC:.c=.o)) $(COMPAT_OBJ)

diff --git a/configure b/configure
index 8b2f879f1e6706df0267737bcbb3b9d7e93fd0f8..6e9a11f5bb15ac595343bb197a4586eed4214a91 100755 (executable)
--- a/configure
+++ b/configure
@@ -24475,7 +24475,7 @@ fi
 
 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: error: No ldns library found and no ldns-src.tar.gz, use --with-ldns=path." >&2;}
    { (exit 1); exit 1; }; }
@@ -24487,7 +24487,7 @@ echo "*** Building ldns library from package included in this one. ***"
 echo "***                                                          ***"
 echo "****************************************************************"
 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*`
 { echo "$as_me:$LINENO: Configure $ldnsdir" >&5
 echo "$as_me: Configure $ldnsdir" >&6;}

diff --git a/configure.ac b/configure.ac
index e4d70fd775187c9033323b13de07a7e9c16c03a5..4bdf63ddb77fca860440928ed1c9733187957499 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -559,7 +559,7 @@ fi
 
 ] , [
 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.])
 fi
 echo "****************************************************************"
@@ -569,7 +569,7 @@ echo "*** Building ldns library from package included in this one. ***"
 echo "***                                                          ***"
 echo "****************************************************************"
 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*`
 AC_MSG_NOTICE([Configure $ldnsdir])
 echo "(cd $ldnsdir; ./configure)"

diff --git a/doc/Changelog b/doc/Changelog
index 2de831fb7766127f3fe53f05bb1ea9714484c2f2..eb937c230e84d2ae5d1a7865836e5eac160c2e3c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 31 October 2007: Wouter
        - cache-max-ttl config option.
+       - building outside sourcedir works again.
 
 30 October 2007: Wouter
        - fixup assertion failure that relied on compressed names to be