From: Matthijs Mekking <matje@nlnetlabs.nl>
Date: Mon, 10 Oct 2011 08:56:23 +0000 (+0000)
Subject: revert dynlinking
X-Git-Tag: release-1.4.14rc1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcdd32e7e143b299233693367fd4a774a0337476;p=thirdparty%2Funbound.git

revert dynlinking



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

diff --git a/Makefile.in b/Makefile.in
index a03368964..c0042b350 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -257,7 +257,7 @@ endif
 
 unbound$(EXEEXT):	$(DAEMON_OBJ) libunbound.la
 	$(INFO) Link $@
-	$Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) $(EXTRALINK) -L. -L.libs -lunbound -lssl $(LIBS)
+	$Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) $(EXTRALINK) -lssl $(LIBS)
 
 unbound-checkconf$(EXEEXT):	$(CHECKCONF_OBJ) libunbound.la
 	$(INFO) Link $@
diff --git a/doc/Changelog b/doc/Changelog
index 7075d2b6b..030b44788 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,7 +1,3 @@
-6 October 2011: Matthijs
-	- link unbound against unbound library
-	* Probably needs to be reverted: because of performances optimizations
-
 27 September 2011: Wouter
 	- unbound.exe -w windows option for start and stop service.