revert dynlinking

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

diff --git a/Makefile.in b/Makefile.in
index a033689646606597a31840b794bcfafd470d0b7f..c0042b3504b45ccba6052a6d19e676c1f5b5e16f 100644 (file)
--- 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 7075d2b6bebb0466c25c839a630fb196a7a37e39..030b44788c49c9c57a827d97911b5a0a642bc907 100644 (file)
--- 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.