|
1 | | -From 13df793bce0a09769676455cc923410c1af04cc6 Mon Sep 17 00:00:00 2001 |
| 1 | +From 4492b781ac52e9ff6e8266e5c1a729a838cb9135 Mon Sep 17 00:00:00 2001 |
2 | 2 | From: Jian Chang <aa65535@live.com> |
3 | 3 | Date: Tue, 7 Feb 2017 20:53:44 +0800 |
4 | 4 | Subject: [PATCH] embed libudns |
5 | 5 |
|
6 | 6 | --- |
7 | 7 | Makefile.am | 4 +- |
8 | | - configure.ac | 1 + |
| 8 | + configure.ac | 3 +- |
9 | 9 | libudns/Makefile.am | 8 + |
10 | 10 | libudns/dnsget.1 | 195 +++++++ |
11 | 11 | libudns/dnsget.c | 759 ++++++++++++++++++++++++++ |
@@ -33,7 +33,7 @@ Subject: [PATCH] embed libudns |
33 | 33 | libudns/udns_rr_srv.c | 155 ++++++ |
34 | 34 | libudns/udns_rr_txt.c | 98 ++++ |
35 | 35 | src/Makefile.am | 11 +- |
36 | | - 29 files changed, 7605 insertions(+), 7 deletions(-) |
| 36 | + 29 files changed, 7605 insertions(+), 9 deletions(-) |
37 | 37 | create mode 100644 libudns/Makefile.am |
38 | 38 | create mode 100644 libudns/dnsget.1 |
39 | 39 | create mode 100644 libudns/dnsget.c |
@@ -76,23 +76,23 @@ index 06af285..8d6070e 100644 |
76 | 76 |
|
77 | 77 | if ENABLE_DOCUMENTATION |
78 | 78 | diff --git a/configure.ac b/configure.ac |
79 | | -index 008c2d2..ce5df55 100755 |
| 79 | +index c816824..5ac1a6e 100755 |
80 | 80 | --- a/configure.ac |
81 | 81 | +++ b/configure.ac |
82 | 82 | @@ -277,13 +277,12 @@ dnl Add define for libudns to enable IPv6 support |
83 | 83 | dnl This is an option defined in the origin configure script |
84 | 84 | AC_DEFINE([HAVE_IPv6], [1], [Enable IPv6 support in libudns]) |
85 | | - |
| 85 | + |
86 | 86 | -AC_CHECK_HEADERS([udns.h], [], [AC_MSG_ERROR([Couldn't find libudns. Try installing libudns-dev or udns-devel.])]) |
87 | 87 | -AC_CHECK_LIB([udns], [dns_dnlen], [LIBS="-ludns $LIBS"], [AC_MSG_ERROR([Couldn't find libudns. Try installing libudns-dev or udns-devel.])]) |
88 | 88 | AC_CHECK_HEADERS([ev.h], [], [AC_MSG_ERROR([Couldn't find libev. Try installing libev-dev@<:@el@:>@.])]) |
89 | 89 | AC_CHECK_LIB([ev], [ev_loop_destroy], [LIBS="-lev $LIBS"], [AC_MSG_ERROR([Couldn't find libev. Try installing libev-dev@<:@el@:>@.])]) |
90 | | - |
| 90 | + |
91 | 91 | AC_CONFIG_FILES([shadowsocks-libev.pc |
92 | 92 | Makefile |
93 | 93 | + libudns/Makefile |
94 | 94 | src/Makefile]) |
95 | | - |
| 95 | + |
96 | 96 | AM_COND_IF([USE_SYSTEM_SHARED_LIB], |
97 | 97 | diff --git a/libudns/Makefile.am b/libudns/Makefile.am |
98 | 98 | new file mode 100644 |
|
0 commit comments