From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 16 Feb 2007 17:13:18 +0000 (+0000)
Subject: makefile supports libobj replacements.
X-Git-Tag: release-0.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f4505c07533028f8ea17aaaf66761eff41e6ad8;p=thirdparty%2Funbound.git

makefile supports libobj replacements.
check for ldns later - since it breaks compile checks after that.


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

diff --git a/Makefile.in b/Makefile.in
index b9f6ded11..ecc72a9a3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,7 +50,7 @@ INSTALL=$(srcdir)/install-sh
 
 COMMON_SRC=$(wildcard services/*.c util/*.c)
 COMMON_OBJ=$(addprefix $(BUILD),$(COMMON_SRC:.c=.o))
-COMPAT_OBJ=$(addprefix $(BUILD)compat/,$(LIBOBJS)))
+COMPAT_OBJ=$(addprefix $(BUILD)compat/,$(LIBOBJS))
 UNITTEST_SRC=testcode/unitmain.c $(COMMON_SRC)
 UNITTEST_OBJ=$(addprefix $(BUILD),$(UNITTEST_SRC:.c=.o)) $(COMPAT_OBJ)
 DAEMON_SRC=$(wildcard daemon/*.c) $(COMMON_SRC)
diff --git a/configure.ac b/configure.ac
index 52524bb33..63486409f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -387,17 +387,6 @@ AC_SEARCH_LIBS(event_set, [event])
 AC_CHECK_HEADERS([event.h],,, [AC_INCLUDES_DEFAULT])
 AC_CHECK_FUNCS([event_base_free]) # only in libevent 1.2 and later
 
-AC_ARG_WITH(ldns,
-        AC_HELP_STRING([--with-ldns=PATH        specify prefix of path of ldns library to use])
-	, [ specialldnsdir="$withval"
-	CPPFLAGS="$CPPFLAGS -I$withval/include"
-	LDFLAGS="$LDFLAGS -L$withval -L$withval/lib -lldns"
-	ldnsdir="$withval"
-	AC_SUBST(ldnsdir)
-])
-
-AC_CHECK_LIB(ldns, ldns_rr_new,, [AC_MSG_ERROR([Can't find ldns library])])
-
 # check to see if libraries are needed for these functions.
 AC_CHECK_LIB(socket, socket)
 AC_CHECK_LIB(nsl, inet_pton)
@@ -418,6 +407,19 @@ if test $ac_cv_func_getaddrinfo = no; then
 AC_LIBOBJ([fake-rfc2553])
 fi
 
+# check this after all other compilation checks, since the linking of the lib
+# may break checks after this.
+AC_ARG_WITH(ldns,
+        AC_HELP_STRING([--with-ldns=PATH        specify prefix of path of ldns library to use])
+	, [ specialldnsdir="$withval"
+	CPPFLAGS="$CPPFLAGS -I$withval/include"
+	LDFLAGS="$LDFLAGS -L$withval -L$withval/lib -lldns"
+	ldnsdir="$withval"
+	AC_SUBST(ldnsdir)
+])
+
+AC_CHECK_LIB(ldns, ldns_rr_new,, [AC_MSG_ERROR([Can't find ldns library])])
+
 AC_DEFINE_UNQUOTED([MAXSYSLOGMSGLEN], [512], [Define to the maximum message length to pass to syslog.])
 
 AH_BOTTOM([
diff --git a/doc/Changelog b/doc/Changelog
index fe1cd2ae4..0b8ee5473 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 16 February 2007: Wouter
 	- Updated testbed script, works better by using make on remote end.
 	- removed check decls, we can compile without them.
+	- makefile supports LIBOBJ replacements.
 
 15 February 2007: Wouter
 	- port to FreeBSD 4.11 Dec Alpha. Also works on Solaris 10 sparc64,