Imported Upstream version 0.8.0~pre2upstream/0.8.0_pre2

3 files changed, 37 insertions, 27 deletions

diff --git a/COPYING b/COPYING
index 94a9ed0..173ff49 100644
--- a/COPYING
+++ b/COPYING
@@ -672,3 +672,16 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+  In addition, as a special exception, the copyright holders give
+permission to link the code of portions of this program with the
+OpenSSL library under certain conditions as described in each
+individual source file, and distribute linked combinations including
+the two.
+  You must obey the GNU General Public License in all respects for all
+of the code used other than OpenSSL.  If you modify file(s) with this
+exception, you may extend this exception to your version of the
+file(s), but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  If you delete
+this exception statement from all source files in the program, then
+also delete it here.
diff --git a/src/Makefile.am b/src/Makefile.am
index 3f65566..7c86e3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -300,15 +300,15 @@ libknotd_la_SOURCES =				\
 	knot/zone/zone-dump.h			\
 	knot/server/server.h
 
-libknotd_la_LIBADD = ../libknot/libknot.la libknots.la @LIBOBJS@
+libknotd_la_LIBADD = libknot.la libknots.la @LIBOBJS@
 libknots_la_LIBADD = @LIBOBJS@
-knotd_LDADD = libknotd.la ../libknot/libknot.la libknots.la @LIBOBJS@
-knotc_LDADD = libknotd.la ../libknot/libknot.la libknots.la @LIBOBJS@
-knot_zcompile_LDADD = libknots.la ../libknot/libknot.la libknotd.la @LIBOBJS@
+knotd_LDADD = libknotd.la libknot.la libknots.la @LIBOBJS@
+knotc_LDADD = libknotd.la libknot.la libknots.la @LIBOBJS@
+knot_zcompile_LDADD = libknots.la libknot.la libknotd.la @LIBOBJS@
 unittests_LDADD = libknotd.la libknots.la @LIBOBJS@
-unittests_zcompile_LDADD = ../libknot/libknot.la libknots.la libknotd.la @LIBOBJS@
-unittests_libknot_LDADD = ../libknot/libknot.la libknots.la @LIBOBJS@
-unittests_libknot_realdata_LDADD = ../libknot/libknot.la libknots.la @LIBOBJS@
+unittests_zcompile_LDADD = libknot.la libknots.la libknotd.la @LIBOBJS@
+unittests_libknot_LDADD = libknot.la libknots.la @LIBOBJS@
+unittests_libknot_realdata_LDADD = libknot.la libknots.la @LIBOBJS@
 
 # automake complains on % rules:
 #   `%'-style pattern rules are a GNU make extension
diff --git a/src/Makefile.in b/src/Makefile.in
index 7811da5..91106e4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -67,7 +67,7 @@ am_libknot_la_OBJECTS = libknot_error.lo utils.lo debug.lo \
 	ddns.lo edns.lo rrset.lo dname.lo rdata.lo nsec3.lo tsig.lo \
 	tsig-op.lo
 libknot_la_OBJECTS = $(am_libknot_la_OBJECTS)
-libknotd_la_DEPENDENCIES = ../libknot/libknot.la libknots.la @LIBOBJS@
+libknotd_la_DEPENDENCIES = libknot.la libknots.la @LIBOBJS@
 am_libknotd_la_OBJECTS = gatherer.lo stat.lo log.lo error.lo \
 	libknotd_la-cf-parse.lo libknotd_la-cf-lex.lo conf.lo \
 	logconf.lo process.lo dthreads.lo journal.lo socket.lo \
@@ -89,16 +89,14 @@ am_knot_zcompile_OBJECTS = zcompile_main.$(OBJEXT) \
 	zcompile.$(OBJEXT) parser-util.$(OBJEXT) \
 	parser-descriptor.$(OBJEXT)
 knot_zcompile_OBJECTS = $(am_knot_zcompile_OBJECTS)
-knot_zcompile_DEPENDENCIES = libknots.la ../libknot/libknot.la \
-	libknotd.la @LIBOBJS@
+knot_zcompile_DEPENDENCIES = libknots.la libknot.la libknotd.la \
+	@LIBOBJS@ $(am__empty)
 am_knotc_OBJECTS = knotc_main.$(OBJEXT)
 knotc_OBJECTS = $(am_knotc_OBJECTS)
-knotc_DEPENDENCIES = libknotd.la ../libknot/libknot.la libknots.la \
-	@LIBOBJS@ $(am__empty)
+knotc_DEPENDENCIES = libknotd.la libknot.la libknots.la @LIBOBJS@
 am_knotd_OBJECTS = main.$(OBJEXT)
 knotd_OBJECTS = $(am_knotd_OBJECTS)
-knotd_DEPENDENCIES = libknotd.la ../libknot/libknot.la libknots.la \
-	@LIBOBJS@ $(am__empty)
+knotd_DEPENDENCIES = libknotd.la libknot.la libknots.la @LIBOBJS@
 am_unittests_OBJECTS = acl_tests.$(OBJEXT) da_tests.$(OBJEXT) \
 	events_tests.$(OBJEXT) skiplist_tests.$(OBJEXT) \
 	slab_tests.$(OBJEXT) fdset_tests.$(OBJEXT) \
@@ -118,8 +116,7 @@ am_unittests_libknot_OBJECTS = cuckoo_tests.$(OBJEXT) \
 	zone_tests.$(OBJEXT) zone_tree_tests.$(OBJEXT) \
 	zonedb_tests.$(OBJEXT) unittests_libknot.$(OBJEXT)
 unittests_libknot_OBJECTS = $(am_unittests_libknot_OBJECTS)
-unittests_libknot_DEPENDENCIES = ../libknot/libknot.la libknots.la \
-	@LIBOBJS@ $(am__empty)
+unittests_libknot_DEPENDENCIES = libknot.la libknots.la @LIBOBJS@
 am_unittests_libknot_realdata_OBJECTS =  \
 	dname_tests_realdata.$(OBJEXT) \
 	response_tests_realdata.$(OBJEXT) \
@@ -131,15 +128,15 @@ am_unittests_libknot_realdata_OBJECTS =  \
 	unittests_libknot_realdata.$(OBJEXT)
 unittests_libknot_realdata_OBJECTS =  \
 	$(am_unittests_libknot_realdata_OBJECTS)
-unittests_libknot_realdata_DEPENDENCIES = ../libknot/libknot.la \
-	libknots.la @LIBOBJS@
+unittests_libknot_realdata_DEPENDENCIES = libknot.la libknots.la \
+	@LIBOBJS@ $(am__empty)
 am_unittests_zcompile_OBJECTS = zcompile-error.$(OBJEXT) \
 	zparser.$(OBJEXT) zlexer.$(OBJEXT) zcompile.$(OBJEXT) \
 	parser-util.$(OBJEXT) parser-descriptor.$(OBJEXT) \
 	unittests_zp_main.$(OBJEXT)
 unittests_zcompile_OBJECTS = $(am_unittests_zcompile_OBJECTS)
-unittests_zcompile_DEPENDENCIES = ../libknot/libknot.la libknots.la \
-	libknotd.la @LIBOBJS@
+unittests_zcompile_DEPENDENCIES = libknot.la libknots.la libknotd.la \
+	@LIBOBJS@ $(am__empty)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -617,15 +614,15 @@ libknotd_la_SOURCES = \
 	knot/zone/zone-dump.h			\
 	knot/server/server.h
 
-libknotd_la_LIBADD = ../libknot/libknot.la libknots.la @LIBOBJS@
+libknotd_la_LIBADD = libknot.la libknots.la @LIBOBJS@
 libknots_la_LIBADD = @LIBOBJS@
-knotd_LDADD = libknotd.la ../libknot/libknot.la libknots.la @LIBOBJS@
-knotc_LDADD = libknotd.la ../libknot/libknot.la libknots.la @LIBOBJS@
-knot_zcompile_LDADD = libknots.la ../libknot/libknot.la libknotd.la @LIBOBJS@
+knotd_LDADD = libknotd.la libknot.la libknots.la @LIBOBJS@
+knotc_LDADD = libknotd.la libknot.la libknots.la @LIBOBJS@
+knot_zcompile_LDADD = libknots.la libknot.la libknotd.la @LIBOBJS@
 unittests_LDADD = libknotd.la libknots.la @LIBOBJS@
-unittests_zcompile_LDADD = ../libknot/libknot.la libknots.la libknotd.la @LIBOBJS@
-unittests_libknot_LDADD = ../libknot/libknot.la libknots.la @LIBOBJS@
-unittests_libknot_realdata_LDADD = ../libknot/libknot.la libknots.la @LIBOBJS@
+unittests_zcompile_LDADD = libknot.la libknots.la libknotd.la @LIBOBJS@
+unittests_libknot_LDADD = libknot.la libknots.la @LIBOBJS@
+unittests_libknot_realdata_LDADD = libknot.la libknots.la @LIBOBJS@
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am