summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING1
-rw-r--r--licenses/COPYING.DNS19
-rw-r--r--src/Makefile_Ecore_Con.am8
-rw-r--r--src/static_libs/dns/dns.c (renamed from src/lib/ecore_con/dns.c)0
-rw-r--r--src/static_libs/dns/dns.h (renamed from src/lib/ecore_con/dns.h)0
5 files changed, 27 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index 77e6f464bf..205c98b433 100644
--- a/COPYING
+++ b/COPYING
@@ -21,6 +21,7 @@ ector: licenses/COPYING.FTL, licenses/COPYING.GPL (dual licenses)
21evas: licenses/COPYING.BSD 21evas: licenses/COPYING.BSD
22embryo: licenses/COPYING.SMALL 22embryo: licenses/COPYING.SMALL
23ecore: licenses/COPYING.BSD 23ecore: licenses/COPYING.BSD
24dns: licenses/COPYING.DNS
24eio: licenses/COPYING.LGPL 25eio: licenses/COPYING.LGPL
25eldbus: licenses/COPYING.LGPL 26eldbus: licenses/COPYING.LGPL
26efreet: licenses/COPYING.BSD 27efreet: licenses/COPYING.BSD
diff --git a/licenses/COPYING.DNS b/licenses/COPYING.DNS
new file mode 100644
index 0000000000..ee15b155bf
--- /dev/null
+++ b/licenses/COPYING.DNS
@@ -0,0 +1,19 @@
1Copyright (c) 2008-2015 William Ahern <william@25thandClement.com>
2
3Permission is hereby granted, free of charge, to any person obtaining a copy
4of this software and associated documentation files (the "Software"), to
5deal in the Software without restriction, including without limitation the
6rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7sell copies of the Software, and to permit persons to whom the Software is
8furnished to do so, subject to the following conditions:
9
10The above copyright notice and this permission notice shall be included in
11all copies or substantial portions of the Software.
12
13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19IN THE SOFTWARE.
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 25569ab295..4e109cad7e 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -69,7 +69,9 @@ if HAVE_CARES
69lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_ares.c 69lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_ares.c
70else 70else
71if HAVE_IPV6 71if HAVE_IPV6
72lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_dns.c lib/ecore_con/dns.c lib/ecore_con/dns.h 72lib_ecore_con_libecore_con_la_SOURCES += \
73lib/ecore_con/ecore_con_dns.c \
74static_libs/dns/dns.c
73else 75else
74lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_info.c 76lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_info.c
75endif 77endif
@@ -82,6 +84,10 @@ lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
82 84
83lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/http-parser 85lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/http-parser
84 86
87if HAVE_IPV6
88lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/dns/
89endif
90
85EXTRA_DIST += \ 91EXTRA_DIST += \
86tests/ecore_con/server.key \ 92tests/ecore_con/server.key \
87tests/ecore_con/server.pem \ 93tests/ecore_con/server.pem \
diff --git a/src/lib/ecore_con/dns.c b/src/static_libs/dns/dns.c
index 0100550680..0100550680 100644
--- a/src/lib/ecore_con/dns.c
+++ b/src/static_libs/dns/dns.c
diff --git a/src/lib/ecore_con/dns.h b/src/static_libs/dns/dns.h
index 650dd03e7c..650dd03e7c 100644
--- a/src/lib/ecore_con/dns.h
+++ b/src/static_libs/dns/dns.h